diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
index 3131f2d3..34b6f25b 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
@@ -10,7 +10,6 @@ import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.sensitive.SensitiveWordService;
 import com.mdp.swagger.ApiEntityParams;
-import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmFunc;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.service.XmFuncService;
@@ -76,7 +75,7 @@ public class XmFuncController {
 		
 		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
-		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
+		QueryWrapper<XmFunc> qw = QueryTools.initQueryWrapper(XmFunc.class , params);
 		List<Map<String,Object>> datas = xmFuncService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmFunc列表
 
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
index 755aa849..bb868bfe 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
@@ -8,7 +8,6 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
-import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmRecordVisit;
 import com.xm.core.service.XmRecordVisitService;
 import io.swagger.annotations.*;
@@ -67,7 +66,7 @@ public class XmRecordVisitController {
 		
 		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
-		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
+		QueryWrapper<XmRecordVisit> qw = QueryTools.initQueryWrapper(XmRecordVisit.class , params);
 		List<Map<String,Object>> datas = xmRecordVisitService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmRecordVisit列表
 
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
index 1f31efe1..74a67e7c 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
@@ -9,7 +9,6 @@ import com.mdp.core.utils.RequestUtils;
 import com.mdp.safe.client.entity.User;
 import com.mdp.safe.client.utils.LoginUtils;
 import com.mdp.swagger.ApiEntityParams;
-import com.xm.core.entity.XmBranchStateHis;
 import com.xm.core.entity.XmProduct;
 import com.xm.core.entity.XmTestCasedb;
 import com.xm.core.service.XmGroupService;
@@ -77,7 +76,7 @@ public class XmTestCasedbController {
 		User user=LoginUtils.getCurrentUserInfo();
 		params.put("pbranchId",user.getBranchId());
 		IPage page=QueryTools.initPage(params);
-		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
+		QueryWrapper<XmTestCasedb> qw = QueryTools.initQueryWrapper(XmTestCasedb.class , params);
 		List<Map<String,Object>> datas = xmTestCasedbService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmTestCasedb列表
 
diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
index bab1bc98..5f4cb09c 100644
--- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
+++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java
@@ -785,7 +785,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
 
 	public List<XmTask> listTenTaskByProjectIdAndProductId(String projectId,String productId) {
 
-		return baseMapper.listTenTaskByProjectIdAndProductId(map("projectId", projectId,  productId));
+		return baseMapper.listTenTaskByProjectIdAndProductId(map("projectId", projectId,  "productId",productId));
 	}