From 150065026e194a73b2e5c2a1597e306bc71b0b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 16 May 2022 00:49:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmTaskController.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 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 5bc91acb..78cf2f93 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 @@ -257,13 +257,22 @@ public class XmTaskController { List no=new ArrayList<>(); User user = LoginUtils.getCurrentUserInfo(); for (XmTask xmTaskDb : xmTasksDb) { - tips=groupService.checkIsAdmOrTeamHeadOrAss(user,xmTaskDb.getExecutorUserid(),xmTaskDb.getProjectId()); - if(!tips.isOk()){ - if(user.getUserid().equals(xmTaskDb.getExecutorUserid())||user.getUserid().equals(xmTaskDb.getCreateUserid())){ - can.add(xmTaskDb); - }else{ - no.add(xmTaskDb); + String taskUserid=StringUtils.hasText(xmTaskDb.getExecutorUserid())?xmTaskDb.getExecutorUserid():xmTaskDb.getCreateUserid(); + if(user.getUserid().equals(taskUserid)||user.getUserid().equals(xmTaskDb.getExecutorUserid())){ + if(xmTaskMap.containsKey("createUserid")){ + tips=groupService.checkIsAdmOrTeamHeadOrAss(user, (String) xmTaskMap.get("createUserid"),xmTaskDb.getProjectId()); + } + }else{ + tips=groupService.checkIsAdmOrTeamHeadOrAss(user,taskUserid,xmTaskDb.getProjectId()); + if(tips.isOk()){ + if(xmTaskMap.containsKey("createUserid")){ + tips=groupService.checkIsAdmOrTeamHeadOrAss(user, (String) xmTaskMap.get("createUserid"),xmTaskDb.getProjectId()); + } } + } + + if(!tips.isOk()){ + no.add(xmTaskDb); }else{ can.add(xmTaskDb); } @@ -287,10 +296,10 @@ public class XmTaskController { } List msgs=new ArrayList<>(); if(can.size()>0){ - msgs.add(String.format("成功更新以下%s个任务",can.size())); + msgs.add(String.format("成功更新%s个任务",can.size())); } if(no.size()>0){ - msgs.add(String.format("以下%s个任务无权限更新",no.size())); + msgs.add(String.format("以下%s个任务无权限更新,【%s】。",no.size(),no.stream().map(i->i.getName()).collect(Collectors.joining(",")))); } if(can.size()>0){ tips.setOkMsg(msgs.stream().collect(Collectors.joining()));