diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java index 118ef641..9adde1b8 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java @@ -132,8 +132,7 @@ public class XmBranchStateController { XmBranchState xmBranchStateQuery = new XmBranchState(xmBranchState.getId()); if(xmBranchStateService.countByWhere(xmBranchStateQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmBranchStateService.insert(xmBranchState); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java index c10e8195..b36849fd 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmBranchTaskTypeStateController.java @@ -100,8 +100,7 @@ public class XmBranchTaskTypeStateController { XmBranchTaskTypeState xmBranchTaskTypeStateQuery = new XmBranchTaskTypeState(xmBranchTaskTypeState.getId()); if(xmBranchTaskTypeStateService.countByWhere(xmBranchTaskTypeStateQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmBranchTaskTypeStateService.insert(xmBranchTaskTypeState); 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 f2f72ea9..4c01d3b1 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 @@ -307,8 +307,7 @@ public class XmGroupController { XmGroup xmGroupQuery = new XmGroup(xmGroup.getId()); if (xmGroupService.countByWhere(xmGroupQuery) > 0) { return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } if(!StringUtils.hasText(xmGroup.getBranchId())){ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java index 1f474117..460c3661 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupStateController.java @@ -94,8 +94,7 @@ public class XmGroupStateController { XmProjectGroupState xmGroupStateQuery = new XmProjectGroupState(xmGroupState.getId()); if(xmGroupStateService.countByWhere(xmGroupStateQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmGroupStateService.insert(xmGroupState); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java index eb3df4fa..c0b750e7 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java @@ -161,8 +161,7 @@ public class XmGroupUserController { if(xmGroupUserService.countByWhere(gu)>0){ return Result.error("该用户已在小组中"); - m.put("tips", tips); - return m; + } xmGroupUserService.insert(gu); Map usermap=new HashMap<>(); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java index d1f266e4..840a9a39 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationStateController.java @@ -121,8 +121,7 @@ public class XmIterationStateController { XmIterationState xmIterationStateQuery = new XmIterationState(xmIterationState.getId()); if(xmIterationStateService.countByWhere(xmIterationStateQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmIterationStateService.insert(xmIterationState); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index e35e613f..66bccca4 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -240,8 +240,7 @@ public class XmMenuController { XmMenu xmMenuQuery = new XmMenu(xmMenu.getMenuId()); if(xmMenuService.countByWhere(xmMenuQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } Set words=sensitiveWordService.getSensitiveWord(xmMenu.getMenuName()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java index d4003e67..a3aeee2b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java @@ -126,8 +126,7 @@ public class XmMenuPlanController { if(xmMenuPlanService.countByWhere(xmMenuPlan)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } xmMenuPlanService.insert(xmMenuPlan); return Result.ok(); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java index b06e1d14..bda92c7c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java @@ -122,8 +122,7 @@ public class XmMenuStateController { if(xmMenuStateService.countByWhere(xmMenuState)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } xmMenuStateService.insert(xmMenuState); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index c46b1eec..6c17d22f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -1,10 +1,9 @@ package com.xm.core.ctrl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.mdp.core.entity.Result; -import com.mdp.core.entity.Tips; -import com.mdp.core.err.BizException; import com.mdp.core.query.QueryTools; import com.mdp.core.utils.RequestUtils; import com.mdp.msg.client.PushNotifyMsgService; @@ -12,6 +11,7 @@ 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.XmProduct; import com.xm.core.entity.XmProductCopyVo; import com.xm.core.entity.XmProductProjectLink; @@ -34,7 +34,6 @@ import java.util.stream.Collectors; import static com.mdp.core.utils.BaseUtils.fromMap; import static com.mdp.core.utils.BaseUtils.toMap; -import static com.mdp.core.utils.ResponseHelper.failed; /** * url编制采用rest风格,如对XM.xm_product 产品表的操作有增删改查,对应的url分别为:
@@ -112,8 +111,7 @@ public class XmProductController { }else if("productId".equals(queryScope)){ if(!StringUtils.hasText(id)){ return Result.error("产品编号id必输"); - m.put("tips", tips); - return m; + } } @@ -166,8 +164,7 @@ public class XmProductController { }else if("productId".equals(queryScope)){ if(!StringUtils.hasText(id)){ return Result.error("产品编号id必输"); - m.put("tips", tips); - return m; + } } @@ -236,8 +233,7 @@ public class XmProductController { xmProductQuery.setCode(xmProduct.getCode()); if(xmProductService.countByWhere(xmProductQuery)>0){ return Result.error("产品代号已存在，请修改再提交"); - m.put("tips", tips); - return m; + } } if(xmProduct.getLinks()!=null && xmProduct.getLinks().size()>0){ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java index 1251edb7..2903fce3 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductProjectLinkController.java @@ -92,8 +92,7 @@ public class XmProductProjectLinkController { } if(xmProductProjectLinkService.selectOneObject(xmProductProjectLink) !=null ){ return Result.error("已加入，无需再添加"); - m.put("tips", tips); - return m; + } if(!xmGroupService.checkUserIsProductAdm(xmProductProjectLink.getProductId(),user.getUserid())){ if(!xmGroupService.checkUserIsProjectAdm(xmProductProjectLink.getProjectId(),user.getUserid())){ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java index 7c51e1a3..9226fcb6 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductStateController.java @@ -133,8 +133,7 @@ public class XmProductStateController { XmProductState xmProductStateQuery = new XmProductState(xmProductState.getId()); if(xmProductStateService.countByWhere(xmProductStateQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmProductStateService.insert(xmProductState); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java index ff8522c5..276b53b0 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectContractController.java @@ -78,8 +78,7 @@ public class XmProjectContractController { XmProjectContract xmProjectContractQuery = new XmProjectContract(xmProjectContract.getHtId()); if(xmProjectContractService.countByWhere(xmProjectContractQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmProjectContractService.insert(xmProjectContract); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index a886e21d..98c9ff6c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -508,8 +508,7 @@ public class XmProjectController { XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(xmProject.getId()); if(xmProjectDb==null){ return Result.error("项目不存在"); - m.put("tips", tips); - return m; + } XmProject xmProjectTo=this.xmProjectService.copyProject(user,xmProject); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java index ed1a7722..8bc6b98b 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiController.java @@ -95,8 +95,7 @@ public class XmProjectKpiController { XmProjectKpi xmProjectKpiQuery = new XmProjectKpi(xmProjectKpi.getId()); if(xmProjectKpiService.countByWhere(xmProjectKpiQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmProjectKpiService.insert(xmProjectKpi); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java index 15ab8c2a..74b4f4cc 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectKpiHisController.java @@ -98,8 +98,7 @@ public class XmProjectKpiHisController { XmProjectKpiHis xmProjectKpiHisQuery = new XmProjectKpiHis(xmProjectKpiHis.getKpiId()); if(xmProjectKpiHisService.countByWhere(xmProjectKpiHisQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmProjectKpiHisService.insert(xmProjectKpiHis); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java index 34e86f6a..7c8930c0 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateController.java @@ -191,8 +191,7 @@ public class XmProjectStateController { XmProjectState xmProjectStateQuery = new XmProjectState(xmProjectState.getId()); if(xmProjectStateService.countByWhere(xmProjectStateQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmProjectStateService.insert(xmProjectState); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java index d6056203..d5c5e67e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectStateHisController.java @@ -139,8 +139,7 @@ public class XmProjectStateHisController { XmProjectStateHis xmProjectStateHisQuery = new XmProjectStateHis(xmProjectStateHis.getId()); if(xmProjectStateHisService.countByWhere(xmProjectStateHisQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmProjectStateHisService.insert(xmProjectStateHis); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java index 6c241051..ea2b4804 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectTaskTypeStateController.java @@ -116,8 +116,7 @@ public class XmProjectTaskTypeStateController { XmProjectTaskTypeState xmProjectTaskTypeStateQuery = new XmProjectTaskTypeState(xmProjectTaskTypeState.getId()); if(xmProjectTaskTypeStateService.countByWhere(xmProjectTaskTypeStateQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmProjectTaskTypeStateService.insert(xmProjectTaskTypeState); 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 38caceab..81bbb3d0 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 @@ -179,8 +179,7 @@ public class XmQuestionController { if(!StringUtils.hasText(xmQuestionVo.getProjectId())){ return Result.error("项目编号projectId必传"); - m.put("tips", tips); - return m; + } User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmQuestionVo.getQtype())){ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java index 4c189eec..871fa934 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionHandleController.java @@ -97,8 +97,7 @@ public class XmQuestionHandleController { XmQuestionHandle xmQuestionHandleQuery = new XmQuestionHandle(xmQuestionHandle.getId()); if(xmQuestionHandleService.countByWhere(xmQuestionHandleQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmQuestionHandleService.insert(xmQuestionHandle); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java index 4d23506e..c47e18cc 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmQuestionTagController.java @@ -86,8 +86,7 @@ public class XmQuestionTagController { XmQuestionTag xmQuestionTagQuery = new XmQuestionTag(xmQuestionTag.getId()); if(xmQuestionTagService.countByWhere(xmQuestionTagQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmQuestionTagService.insert(xmQuestionTag); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java index 2d3914b7..e77ad1f5 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmRecordController.java @@ -95,8 +95,7 @@ public class XmRecordController { XmRecord xmRecordQuery = new XmRecord(xmRecord.getId()); if(xmRecordService.countByWhere(xmRecordQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmRecordService.insert(xmRecord); 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 c36e1988..7941f247 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 @@ -537,8 +537,7 @@ public class XmTaskController { if(!StringUtils.hasText(xmTaskVo.getNtype())){ return Result.error("节点类型ntype不能为空"); - m.put("tips", tips); - return m; + } if(!StringUtils.hasText(xmTaskVo.getProjectId())){ return ResponseHelper.failed("projectId-0","项目编号不能为空"); @@ -706,8 +705,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTask.getId())){ return Result.error("任务编号不能为空"); - m.put("tips", tips); - return m; + } XmTask xmTaskDb=this.xmTaskService.selectOneObject(xmTask); if(xmTaskDb==null){ @@ -749,14 +747,12 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTaskVo.getId())){ return Result.error("任务编号不能为空"); - m.put("tips", tips); - return m; + } XmTask xmTaskDb=this.xmTaskService.selectOneObject(xmTaskVo); if(xmTaskDb==null){ return Result.error("该任务不存在"); - m.put("tips", tips); - return m; + } @@ -794,8 +790,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTaskVo.getId())){ return Result.error("任务编号不能为空"); - m.put("tips", tips); - return m; + } XmTask xmTaskDb=this.xmTaskService.selectOneObject(xmTaskVo); @@ -849,8 +844,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTask.getId())){ return Result.error("任务编号不能为空"); - m.put("tips", tips); - return m; + } XmTask xmTaskDb=xmTaskService.selectOneObject(xmTask); if(xmTaskDb==null){ @@ -882,8 +876,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(!StringUtils.hasText(xmTask.getId())){ return Result.error("任务编号不能为空"); - m.put("tips", tips); - return m; + } XmTask xmTaskDb=xmTaskService.selectOneObject(xmTask); @@ -918,8 +911,7 @@ public class XmTaskController { User user=LoginUtils.getCurrentUserInfo(); if(xmTasks==null || xmTasks.size()==0){ return Result.error("任务列表不能为空"); - m.put("tips", tips); - return m; + } if(!StringUtils.hasText(batchImportVo.getPtype())){ return ResponseHelper.failed("ptype-0","请上送ptype,0代表项目计划（任务），1代表产品计划（任务）"); @@ -1249,8 +1241,7 @@ public class XmTaskController { if(xmTasks==null || xmTasks.size()==0){ return Result.error("任务列表不能为空"); - m.put("tips", tips); - return m; + } XmTask xmTask=xmTasks.get(0); if(!StringUtils.hasText(xmTask.getId())){ @@ -1357,8 +1348,7 @@ public class XmTaskController { if(xmTasks==null || xmTasks.size()==0){ return Result.error("任务列表不能为空"); - m.put("tips", tips); - return m; + } Map xmTaskDbMap=this.xmTaskService.selectTasksMapByTasks(xmTasks); XmTask xmTaskDb=xmTaskDbMap.values().stream().findFirst().isPresent()?xmTaskDbMap.values().stream().findFirst().get():null; @@ -1500,8 +1490,7 @@ public class XmTaskController { if(xmTasksVo.getTaskIds()==null || xmTasksVo.getTaskIds().size()==0){ return Result.error("任务列表不能为空"); - m.put("tips", tips); - return m; + } if(!StringUtils.hasText(xmTasksVo.getParentTaskid())){ return ResponseHelper.failed("parentTaskid-0", "上级编号不能为空"); 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 2e0a6ef4..89068759 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 @@ -169,8 +169,7 @@ public class XmTaskExecuserController { XmTask xmTaskDb=xmTaskService.selectOneObject(new XmTask(xmTaskExecuser.getTaskId())); if(xmTaskDb==null){ return Result.error("任务已不存在"); - m.put("tips", tips); - return m; + } String projectId=xmTaskDb.getProjectId(); XmProject xmProjectDb=this.xmProjectService.getProjectFromCache(projectId); @@ -178,8 +177,7 @@ public class XmTaskExecuserController { xmTaskExecuser.setBranchId(xmProjectDb.getBranchId()); if(!"0".equals(xmTaskDb.getTaskState()) && !"1".equals(xmTaskDb.getTaskState()) ){ return Result.error("该任务已经处于完工、结算状态，不允许再修改"); - m.put("tips", tips); - return m; + } if(!xmTaskExecuser.getUserid().equals(user.getUserid())){ User userDb=sysClient.getUserByUserid(xmTaskExecuser.getUserid()); @@ -246,8 +244,7 @@ public class XmTaskExecuserController { if(xmTaskExecusers==null || xmTaskExecusers.size()==0){ return Result.error("执行人列表不能为空"); - m.put("tips", tips); - return m; + } User user=LoginUtils.getCurrentUserInfo(); List xmTaskExecuserListDb=this.xmTaskExecuserService.selectListByIds(xmTaskExecusers.stream().map(i->map("taskId",i.getTaskId(),"userid",i.getUserid())).collect(Collectors.toList())); @@ -258,8 +255,7 @@ public class XmTaskExecuserController { XmTask xmTask= xmTaskService.selectOneObject(new XmTask(xmTaskExecuserListDb.get(0).getTaskId())); if(xmTask==null ){ return Result.error("任务已不存在"); - m.put("tips", tips); - return m; + } List noAllowUsers=new ArrayList<>(); List allowUsers=new ArrayList<>(); @@ -321,14 +317,12 @@ public class XmTaskExecuserController { XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTask==null ){ return Result.error("任务已不存在"); - m.put("tips", tips); - return m; + } if(!"0".equals(xmTask.getTaskState()) && !"1".equals(xmTask.getTaskState()) ){ return Result.error("该任务已经处于完工、结算状态，不允许再修改"); - m.put("tips", tips); - return m; + } User user=LoginUtils.getCurrentUserInfo(); @@ -489,13 +483,11 @@ public class XmTaskExecuserController { XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTask==null ){ return Result.error("任务已不存在"); - m.put("tips", tips); - return m; + } if(!"0".equals(xmTask.getTaskState()) && !"1".equals(xmTask.getTaskState()) ){ return Result.error("该任务已经处于完工、结算计划，不允许再修改报价"); - m.put("tips", tips); - return m; + } if("2".equals(xmTask.getEstate())||"3".equals(xmTask.getEstate())){ return ResponseHelper.failed("estate-not-0-1-3","当前任务已缴纳保证金，无法再变更报价信息。"); @@ -533,13 +525,11 @@ public class XmTaskExecuserController { XmTask xmTask= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTask==null ){ return Result.error("任务已不存在"); - m.put("tips", tips); - return m; + } if(!"0".equals(xmTask.getTaskState()) && !"1".equals(xmTask.getTaskState()) ){ return Result.error("该任务已经不需要候选人"); - m.put("tips", tips); - return m; + } User user=LoginUtils.getCurrentUserInfo(); String projectId=xmTaskExecuser.getProjectId(); @@ -571,8 +561,7 @@ public class XmTaskExecuserController { XmTask xmTaskDb= xmTaskService.selectOneObject(new XmTask(taskId)); if(xmTaskDb==null ){ return Result.error("任务已不存在"); - m.put("tips", tips); - return m; + } User user=LoginUtils.getCurrentUserInfo(); String projectId=xmTaskDb.getProjectId(); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java index e67034ac..2ca98568 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSkillController.java @@ -89,8 +89,7 @@ public class XmTaskSkillController { XmTaskSkill xmTaskSkillQuery = new XmTaskSkill(xmTaskSkill.getId()); if(xmTaskSkillService.countByWhere(xmTaskSkillQuery)>0){ return Result.error("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; + } } xmTaskSkillService.insert(xmTaskSkill);