From 5efb744028baf3667d3701b84aca2496528c3b7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 23 Jan 2023 23:23:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E9=98=9F=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmTaskController.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) 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 ab4786b9..2b98ddcb 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 @@ -719,14 +719,19 @@ public class XmTaskController { return ResponseHelper.failed("childrenCnt-no-0","有子计划任务不能删除"); } + 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()); + if(!tips1.isOk()){ + return ResponseHelper.failed(tips1); + } + } + + if(xmTaskService.checkExistsExecuser(xmTaskDb)){ return ResponseHelper.failed("existsExecuser","有待验收、待结算的执行人，不能删除"); }; - XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); - Tips tips1=projectQxService.checkProjectQx(null,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId()); - if(!tips1.isOk()){ - return ResponseHelper.failed(tips1); - } + xmTaskService.deleteTask(xmTaskDb); xmRecordService.addXmTaskRecord(xmTaskDb.getProjectId(), xmTaskDb.getId(), "项目-任务-删除任务", "删除任务"+xmTaskDb.getName()); @@ -768,11 +773,14 @@ public class XmTaskController { XmProject xmProject=xmProjectService.getProjectFromCache(xmTaskDb.getProjectId()); Map> groupsMap=new HashMap<>(); - Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId()); - if(!tips1.isOk()){ - return ResponseHelper.failed(tips1); + if(!groupService.checkUserIsProjectAdm(xmProject,user.getUserid())){ + Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskDb.getCreateUserid(),xmTaskDb.getCreateUsername(),xmTaskDb.getCbranchId()); + if(!tips1.isOk()){ + return ResponseHelper.failed(tips1); + } } - tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),xmTaskVo.getCbranchId()); + + Tips tips1=projectQxService.checkProjectQx(groupsMap,xmProject,2,user,xmTaskVo.getCreateUserid(),xmTaskVo.getCreateUsername(),xmTaskVo.getCbranchId()); if(!tips1.isOk()){ return ResponseHelper.failed(tips1); }