diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
index 21b25e48..dc1581cd 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupController.java
@@ -93,8 +93,6 @@ public class XmGroupController {
 		
 		if(group==null){
 			return Result.error("小组信息不能为空");
-			m.put("tips", tips);
-			return m;
 		}
 		if(!StringUtils.hasText(group.getId())){
 			return ResponseHelper.failed("id-0","小组编号不能为空");
@@ -115,57 +113,40 @@ public class XmGroupController {
 			}
 			if(StringUtils.hasText(group.getLeaderUserid()) && !group.getLeaderUserid().equals(groupDb.getLeaderUserid())){
  				Tips tips = projectQxService.checkProjectQx(project,0,user, groupDb.getLeaderUserid(),groupDb.getLeaderUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
- 				Tips tips =projectQxService.checkProjectScopeQx(project,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
+ 				Result.assertIsFalse(tips);
+ 				tips =projectQxService.checkProjectScopeQx(project,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
+				Result.assertIsFalse(tips);
 			}
 			if(StringUtils.hasText(group.getAssUserid()) && !group.getAssUserid().equals(groupDb.getAssUserid())){
  				Tips tips = projectQxService.checkProjectQx(project,0,user, groupDb.getAssUserid(),groupDb.getAssUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
- 				Tips tips =projectQxService.checkProjectScopeQx(project,0,group.getAssUserid(),group.getAssUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
+				Result.assertIsFalse(tips);
+ 				tips =projectQxService.checkProjectScopeQx(project,0,group.getAssUserid(),group.getAssUsername(),null);
+				Result.assertIsFalse(tips);
 			}
 		}else {
 			XmProduct product=xmProductService.getProductFromCache(groupDb.getProductId());
 			boolean isPm=xmGroupService.checkUserIsProductAdm(product, user.getUserid());
 			if(!isPm){
  				Tips tips = productQxService.checkProductQx(product,0,user);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
+				Result.assertIsFalse(tips);
 			}
 			if(StringUtils.hasText(group.getLeaderUserid()) && !group.getLeaderUserid().equals(groupDb.getLeaderUserid())){
  				Tips tips = productQxService.checkProductQx(product,0,user, groupDb.getLeaderUserid(),groupDb.getLeaderUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
- 				Tips tips =productQxService.checkProductScopeQx(product,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
+				Result.assertIsFalse(tips);
+ 				tips =productQxService.checkProductScopeQx(product,0,group.getLeaderUserid(),group.getLeaderUsername(),null);
+				Result.assertIsFalse(tips);
 			}
 			if(StringUtils.hasText(group.getAssUserid()) && !group.getAssUserid().equals(groupDb.getAssUserid())){
  				Tips tips = productQxService.checkProductQx(product,0,user, groupDb.getAssUserid(),groupDb.getAssUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
- 				Tips tips =productQxService.checkProductScopeQx(product,0,group.getAssUserid(),group.getAssUsername(),null);
-				if(!tips.isOk()){
-					return ResponseHelper.failed(tips);
-				}
+				Result.assertIsFalse(tips);
+ 				tips =productQxService.checkProductScopeQx(product,0,group.getAssUserid(),group.getAssUsername(),null);
+				Result.assertIsFalse(tips);
 			}
 		}
 
 		xmGroupService.parentIdPathsCalcBeforeSave(group);
-		tips= xmGroupService.updateGroup(group,groupDb);	//列出XmProjectGroup列表
+		Tips tips= xmGroupService.updateGroup(group,groupDb);	//列出XmProjectGroup列表
+		Result.assertIsFalse(tips);
 		if("0".equals(groupDb.getPgClass())){
 			xmGroupCacheService.clearProjectGroup(groupDb.getProjectId());
 			xmRecordService.addXmGroupRecord(groupDb.getProjectId(),groupDb.getId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】");
@@ -175,7 +156,7 @@ public class XmGroupController {
 			xmRecordService.addXmProductRecord(groupDb.getProductId(),"团队-小组-修改小组","修改小组信息【"+groupDb.getGroupName()+"】");
 
 		}
-		
+		return Result.ok();
 	}
 
 	@ApiOperation( value = "根据项目Id拿到团队",notes="")
@@ -196,19 +177,19 @@ public class XmGroupController {
 		
 		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
-		List<XmGroupVo>	xmGroupList=new ArrayList<>();
+		List<XmGroupVo>	datas=new ArrayList<>();
 		String iterationId= (String) params.get("iterationId");
 		String projectId= (String) params.get("projectId");
 		String productId= (String) params.get("productId");
 		if(StringUtils.hasText(productId)){
-			xmGroupList = xmGroupService.getProductGroupVoList(productId);	//产品团队
+			datas = xmGroupService.getProductGroupVoList(productId);	//产品团队
 		}else if(StringUtils.hasText(projectId)){
-			xmGroupList = xmGroupService.getProjectGroupVoList(projectId);	//列出XmProjectGroup列表
+			datas = xmGroupService.getProjectGroupVoList(projectId);	//列出XmProjectGroup列表
 		}else if(StringUtils.hasText(iterationId)){
-			xmGroupList = xmGroupService.getProjectGroupVoListByIterationId(iterationId );	//列出XmProjectGroup列表
+			datas = xmGroupService.getProjectGroupVoListByIterationId(iterationId );	//列出XmProjectGroup列表
 		}
 
-		
+		return Result.ok().setData(datas);
 	}
 
 
@@ -233,15 +214,15 @@ public class XmGroupController {
 		RequestUtils.transformArray(params, "ids");		
 		IPage page=QueryTools.initPage(params);
 		User user=LoginUtils.getCurrentUserInfo();
-		String projectId= (String) xmGroup.get("projectId");
-		String productId= (String) xmGroup.get("productId");
-		String iterationId= (String) xmGroup.get("iterationId");
+		String projectId= (String) params.get("projectId");
+		String productId= (String) params.get("productId");
+		String iterationId= (String) params.get("iterationId");
 		if(!StringUtils.hasText(projectId) && !StringUtils.hasText(productId) && !StringUtils.hasText(iterationId)){
 		params.put("branchId",user.getBranchId());
-			xmGroup.put("orCrowBranchId",user.getBranchId());
+			params.put("orCrowBranchId",user.getBranchId());
 		}
 		QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
-		List<Map<String,Object>> datas = sssssssssssssssService.selectListMapByWhere(page,qw,params);
+		List<Map<String,Object>> datas = xmGroupService.selectListMapByWhere(page,qw,params);
 			return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal());	//列出XmProjectGroup列表
 		
 	}
diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java
index dc5998d7..84e7e8f2 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmWorkloadController.java
@@ -29,6 +29,9 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.mdp.core.utils.BaseUtils.map;
+import static com.mdp.core.utils.ResponseHelper.failed;
+
 /**
  * url编制采用rest风格,如对xm_workload 工时登记表的操作有增删改查,对应的url分别为:<br>
  *  新增: core/xmWorkload/add <br>
@@ -356,29 +359,27 @@ public class XmWorkloadController {
  				xmWorkload.setBranchId(xmTestCaseDb.getCbranchId());
  				xmWorkloadService.insert(xmWorkload);
 			}else if("4".equals(xmWorkload.getBizType())){//报工类型1-任务，2-缺陷，3-测试用例设计，4-测试执行
- 				QueryWrapper<XmWorkload> qw = QueryTools.initQueryWrapper(XmWorkload.class);
-				List<Map<String,Object>> datas = xmWorkloadService.selectListMapByWhere(page,qw,params);
-				return Result.ok();
+				Map<String,Object> p=map("planId",xmWorkload.getPlanId(),"caseId",xmWorkload.getCaseId());
+				List<Map<String,Object>> xmTestPlanCaseDbs=this.xmTestPlanCaseService.selectListMapByWhere(QueryTools.initPage(p),QueryTools.initQueryWrapper(XmTestPlanCase.class,p),p);
 				if(xmTestPlanCaseDbs==null||xmTestPlanCaseDbs.size()==0){
-					return Result.error("xmTestPlanCaseDb-0","执行用例已不存在");
+					return failed("xmTestPlanCaseDb-0","执行用例已不存在");
 				}
 				Map<String,Object> xmTestPlanCaseDb=xmTestPlanCaseDbs.get(0);
 				if(!(xmWorkload.getUserid().equals(xmTestPlanCaseDb.get("execUserid")))){
-					return Result.error("userid-err",xmWorkload.getUserid()+"不是当前用例的执行人，无须报工。");
+					return failed("userid-err",xmWorkload.getUserid()+"不是当前用例的执行人，无须报工。");
 				}
 				String projectId= (String) xmTestPlanCaseDb.get("projectId");
 				if(StringUtils.hasText(projectId)){
 					XmProject xmProject=xmProjectService.getProjectFromCache(projectId);
 					if(xmProject==null){
-						return Result.error("project-0","项目已不存在");
+						return failed("project-0","项目已不存在");
 					}
 
 					xmWorkload.setProjectId(xmProject.getId());
 					xmWorkload.setBranchId(xmProject.getBranchId());
 				}else{
-					return Result.error("projectId-0","项目编号不能为空");
+					return failed("projectId-0","项目编号不能为空");
 				}
-
 				xmWorkload.setBizName((String) xmTestPlanCaseDb.get("caseName"));
 				xmWorkload.setCtime(new Date());
 				xmWorkload.setCuserid(user.getUserid());