From 26d191c076d56302920aef17c5edffd327787b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 28 Jan 2023 21:12:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=B8=83=E5=BC=8F=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/ctrl/XmQuestionController.java | 5 ++--- .../java/com/xm/core/ctrl/XmTaskController.java | 8 ++++---- .../com/xm/core/ctrl/XmTaskExecuserController.java | 13 ++++++------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java index f1bfdf4e..4c5c1732 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionController.java @@ -16,7 +16,6 @@ import com.mdp.swagger.ApiEntityParams; import com.xm.core.entity.*; import com.xm.core.service.*; import com.xm.core.service.push.XmPushMsgService; -import com.xm.core.vo.XmGroupVo; import com.xm.core.vo.XmQuestionVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -382,10 +381,10 @@ public class XmQuestionController { String handlerUserid= (String) xmQuestionMap.get("handlerUserid"); String handlerUsername= (String) xmQuestionMap.get("handlerUsername"); XmQuestion xmQuedb=canOper.get(0); - Tips tips1=productQxService.checkProductScopeQx(null,productService.getProductFromCache(xmQuedb.getProductId()),1,user,handlerUserid,handlerUsername,null); + Tips tips1=productQxService.checkProductScopeQx(productService.getProductFromCache(xmQuedb.getProductId()),1,user,handlerUserid,handlerUsername,null); if(!tips1.isOk()){ if(StringUtils.hasText(xmQuedb.getProjectId())){ - tips1=projectQxService.checkProjectScopeQx(null,projectService.getProjectFromCache(xmQuedb.getProjectId()),1,user,handlerUserid,handlerUsername,null); + tips1=projectQxService.checkProjectScopeQx(projectService.getProjectFromCache(xmQuedb.getProjectId()),1,user,handlerUserid,handlerUsername,null); } if(!tips1.isOk()){ return failed(tips1); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 0b80e629..1f6777d5 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -583,7 +583,7 @@ public class XmTaskController { return ResponseHelper.failed(tips1); } if(StringUtils.hasText(xmTaskVo.getCreateUserid()) && !xmTaskVo.getCreateUserid().equals(user.getUserid())){ - tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),null); + tips1=projectQxService.checkProjectQx(xmProject,2,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),null); if(!tips1.isOk()){ return ResponseHelper.failed(tips1); } @@ -726,7 +726,7 @@ public class XmTaskController { XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); if(xmProject!=null && groupService.checkUserIsProjectAdm(xmProject,user.getUserid())){ - Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId()); + Tips tips1=projectQxService.checkProjectQx(xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId()); if(!tips1.isOk()){ return ResponseHelper.failed(tips1); } @@ -838,7 +838,7 @@ public class XmTaskController { } XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); - Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId()); + Tips tips1=projectQxService.checkProjectQx(xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId()); if(!tips1.isOk()){ return ResponseHelper.failed(tips1); } @@ -982,7 +982,7 @@ public class XmTaskController { String projectId=batchImportVo.getProjectId(); String productId=batchImportVo.getProductId(); XmProject xmProject=xmProjectService.getProjectFromCache(projectId); - Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user); + Tips tips1=projectQxService.checkProjectQx(xmProject,2,user); if(!tips1.isOk()){ return ResponseHelper.failed(tips1); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java index 494d1005..3f252d02 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java @@ -208,7 +208,7 @@ public class XmTaskExecuserController { xmTaskExecuser.setStatus("0"); //如果是众包，智能添加为候选人 }else { //如果不是众包，需要判断是否已加入项目组组织架构中，如未加入，需要提示其先加入 - tips=projectQxService.checkProjectQx(null,xmProjectDb,0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId()); + tips=projectQxService.checkProjectQx(xmProjectDb,0,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId()); if(!tips.isOk()){ return ResponseHelper.failed(tips); }; @@ -282,7 +282,7 @@ public class XmTaskExecuserController { break; } if(!user.getUserid().equals(xmTaskExecuser.getUserid())) {//只有组长、任务责任人可以请别人请离开任务 - tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId()); + tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(xmTask.getProjectId()),2, user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId()); if(!tips.isOk()){ return ResponseHelper.failed(tips); }; @@ -358,8 +358,7 @@ public class XmTaskExecuserController { if(xmProject==null ){ return ResponseHelper.failed("project-0","项目已不存在"); } - - groupsMap.put(xmProject.getId(),pgroups); + tips=projectQxService.checkProjectQx(xmProject,2,user); if(tips.isOk()) { @@ -542,7 +541,7 @@ public class XmTaskExecuserController { User user=LoginUtils.getCurrentUserInfo(); String projectId=xmTaskExecuser.getProjectId(); if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { - tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() ); + tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId() ); } if(tips.isOk()) { XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskExecuser.getTaskId(),xmTaskExecuser.getUserid())); @@ -592,7 +591,7 @@ public class XmTaskExecuserController { User user=LoginUtils.getCurrentUserInfo(); String projectId=xmTaskExecuser.getProjectId(); if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { - tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId()); + tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuser.getUserid(),xmTaskExecuser.getUsername(),xmTaskExecuser.getExecUserBranchId()); } if(tips.isOk()) { xmTaskExecuserService.becomeCandidate(xmTaskExecuser); @@ -637,7 +636,7 @@ public class XmTaskExecuserController { XmTaskExecuser xmTaskExecuserDb = xmTaskExecuserService.selectOneObject(new XmTaskExecuser(xmTaskDb.getId(),xmTaskExecuser.getUserid())); if(xmTaskExecuserDb !=null ) { if(!user.getUserid().equals(xmTaskExecuser.getUserid())) { - tips=projectQxService.checkProjectQx(null,xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId()); + tips=projectQxService.checkProjectQx(xmProjectService.getProjectFromCache(projectId),2,user,xmTaskExecuserDb.getUserid(),xmTaskExecuserDb.getUsername(),xmTaskExecuserDb.getExecUserBranchId()); } if( "0".equals( xmTaskExecuserDb.getStatus() ) || "7".equals( xmTaskExecuserDb.getStatus() ) || "8".equals( xmTaskExecuserDb.getStatus() ) ) { xmTaskExecuserService.delete(xmTaskExecuser);