团队重构

xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java

@@ -100,7 +100,7 @@ public class XmEnvListController {
 			}
 			User user= LoginUtils.getCurrentUserInfo();
 			if(StringUtils.hasText(xmEnvList.getProjectId())){
-				boolean inProjectGroup=xmGroupService.checkUserExistsGroup(xmEnvList.getProjectId(),user.getUserid());
+				boolean inProjectGroup=xmGroupService.checkUserExistsProjectGroup(xmEnvList.getProjectId(),user.getUserid());
 				if(!inProjectGroup){
 					return ResponseHelper.failed("no-in-project","您不在项目中【"+xmEnvList.getProjectId()+"】，不能添加环境清单");
 				}
@@ -147,7 +147,7 @@ public class XmEnvListController {
 						return ResponseHelper.failed("writeQx-err-1","您无权更改");
 					}
 				}else if("2".equals(writeQx)){//同一机构同一项目可写
-					boolean inProject=this.xmGroupService.checkUserExistsGroup(xmEnvListDb.getProjectId(), user.getUserid());
+					boolean inProject=this.xmGroupService.checkUserExistsProjectGroup(xmEnvListDb.getProjectId(), user.getUserid());
 					if(!inProject){
 						return ResponseHelper.failed("writeQx-err-2","您不在项目【"+xmEnvListDb.getProjectId()+"】,无权更改");
 					}
@@ -192,7 +192,7 @@ public class XmEnvListController {
 						return ResponseHelper.failed("writeQx-err-1","您无权更改");
 					}
 				}else if("2".equals(writeQx)){//同一机构同一项目可写
-					boolean inProject=this.xmGroupService.checkUserExistsGroup(xmEnvListDb.getProjectId(), user.getUserid());
+					boolean inProject=this.xmGroupService.checkUserExistsProjectGroup(xmEnvListDb.getProjectId(), user.getUserid());
 					if(!inProject){
 						return ResponseHelper.failed("writeQx-err-2","您不在项目【"+xmEnvListDb.getProjectId()+"】,无权更改");
 					}

xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java

@@ -267,6 +267,13 @@ public class XmMenuController {
 			if(words!=null && words.size()>0){
 				return failed("remark-sensitive-word","备注中有敏感词"+words+",请修改后再提交");
 			}
+			if(!StringUtils.hasText(xmMenu.getMenuName())){
+				return failed("menuName-0","需求名称不能为空");
+			}
+
+			if(!StringUtils.hasText(xmMenu.getProductId())){
+				return failed("productId-0","需求归属产品不能为空");
+			}
 			User user= LoginUtils.getCurrentUserInfo();
 			if(StringUtils.isEmpty(xmMenu.getMmUserid())) {
 				xmMenu.setMmUserid(user.getUserid());

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -736,7 +736,7 @@ public class XmTaskController {
 			if(!tips.isOk()){
 				return ResponseHelper.failed(tips);
 			}
-			boolean existsGrouop=groupService.checkUserExistsGroup(xmTaskDb.getProjectId(),xmTaskVo.getCreateUserid());
+			boolean existsGrouop=groupService.checkUserExistsProjectGroup(xmTaskDb.getProjectId(),xmTaskVo.getCreateUserid());
 			if(!existsGrouop){
 				return ResponseHelper.failed("not-member",xmTaskVo.getCreateUsername()+"不是项目组成员，不能作为任务责任人");
 			}

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -106,7 +106,7 @@ public class XmTaskExecuserController {
 		User user=LoginUtils.getCurrentUserInfo();
 		String projectId= (String) xmTaskExecuser.get("projectId");
 		if(StringUtils.hasText(projectId)){
-			if(!groupService.checkUserExistsGroup(projectId,user.getUserid())){
+			if(!groupService.checkUserExistsProjectGroup(projectId,user.getUserid())){
 				xmTaskExecuser.put("linkBranchId",user.getBranchId());
 			}
 		}else{
@@ -136,7 +136,7 @@ public class XmTaskExecuserController {
 		User user=LoginUtils.getCurrentUserInfo();
 		String projectId= (String) xmTaskExecuser.get("projectId");
 		if(StringUtils.hasText(projectId)){
-			if(!groupService.checkUserExistsGroup(projectId,user.getUserid())){
+			if(!groupService.checkUserExistsProjectGroup(projectId,user.getUserid())){
 				xmTaskExecuser.put("linkBranchId",user.getBranchId());
 			}
 		}else{

xm-core/src/main/java/com/xm/core/service/XmGroupService.java

@@ -396,7 +396,7 @@ public class XmGroupService extends BaseService {
 		}
     	return userGroups;
     }
-    public boolean checkUserExistsGroup(String projectId, String userid){
+    public boolean checkUserExistsProjectGroup(String projectId, String userid){
 		List<XmGroupVo> userGroups= getUserGroupsByProjectId(projectId,userid);
 		return userGroups!=null && userGroups.size()>0;