From b8d783a377138c371a1bd5c1f996e2798aaf9e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 18 Jan 2023 13:41:24 +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/XmMenuController.java | 22 ++++++++++---- .../com/xm/core/ctrl/XmTaskController.java | 29 ++++++++++++------- 2 files changed, 34 insertions(+), 17 deletions(-) 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 72132ae0..749b785a 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 @@ -295,7 +295,7 @@ public class XmMenuController { } if(!groupService.checkUserIsProductAdm(xmProduct,user.getUserid())){ if(!groupService.checkUserExistsProductGroup(xmMenu.getProductId(),user.getUserid())){ - return ResponseHelper.failed("noqx","只有产品团队成员可以新增需求"); + return ResponseHelper.failed("noqx-add","只有产品团队成员可以新增需求。【"+user.getUsername()+"】不在产品团队中,请将其拉入产品团队。"); } } @@ -369,7 +369,7 @@ public class XmMenuController { } if(!groupService.checkUserIsProductAdm(xmProduct,user.getUserid())){ if(!groupService.checkUserExistsProductGroup(xmMenuDb.getProductId(),user.getUserid())){ - return ResponseHelper.failed("noqx","只有产品团队成员可以删除需求"); + return ResponseHelper.failed("noqx-del","只有产品团队成员可以删除需求。【"+user.getUsername()+"】不在产品团队中,请将其拉入产品团队。"); } } xmMenuService.deleteByPk(xmMenu); @@ -415,7 +415,7 @@ public class XmMenuController { } if(!groupService.checkUserIsProductAdm(xmProduct,user.getUserid())){ if(!groupService.checkUserExistsProductGroup(xmMenuDb.getProductId(),user.getUserid())){ - return ResponseHelper.failed("noqx","只有产品团队成员可以修改需求"); + return ResponseHelper.failed("noqx-edit","只有产品团队成员可以修改需求。【"+user.getUsername()+"】不在产品团队中,请将其拉入产品团队。"); } } @@ -499,7 +499,17 @@ public class XmMenuController { } if(!groupService.checkUserIsProductAdm(xmProduct,user.getUserid())){ if(!groupService.checkUserExistsProductGroup(xmMenuDb.getProductId(),user.getUserid())){ - return ResponseHelper.failed("noqx","只有产品团队成员可以修改需求"); + return ResponseHelper.failed("noqx-edit","只有产品团队成员可以修改需求。【"+user.getUsername()+"】不在产品团队中,请将其拉入产品团队。"); + } + } + + if(xmMenuMap.containsKey("mmUserid")){ + String mmUserid= (String) xmMenuMap.get("mmUserid"); + String mmUsername= (String) xmMenuMap.get("mmUsername"); + if(!user.getUserid().equals(mmUserid)){ + if(!groupService.checkUserExistsProductGroup(xmMenuDb.getProductId(),mmUserid)){ + return ResponseHelper.failed("no-in-pteam","【"+mmUsername+"】不是产品团队成员，不允许成为需求负责人。"); + } } } @@ -576,7 +586,7 @@ public class XmMenuController { } if(!groupService.checkUserIsProductAdm(xmProduct,user.getUserid())){ if(!groupService.checkUserExistsProductGroup(xmMenuDb.getProductId(),user.getUserid())){ - return ResponseHelper.failed("noqx","只有产品团队成员可以修改需求"); + return ResponseHelper.failed("noqx-del","只有产品团队成员可以删除需求。【"+user.getUsername()+"】不在产品团队中,请将其拉入产品团队。"); } } @@ -708,7 +718,7 @@ public class XmMenuController { } if(!groupService.checkUserIsProductAdm(xmProduct,user.getUserid())){ if(!groupService.checkUserExistsProductGroup(xmMenuDb.getProductId(),user.getUserid())){ - return ResponseHelper.failed("noqx","只有产品团队成员可以修改需求"); + return ResponseHelper.failed("noqx","只有产品团队成员可以修改需求。【"+user.getUsername()+"】不在产品团队中,请将其拉入产品团队。"); } } xmMenusDb=xmMenusDb.stream().filter(i->!i.getMenuId().equals(parentDb.getMenuId())).collect(Collectors.toList()); 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 cbbab723..b1d80616 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 @@ -268,6 +268,7 @@ public class XmTaskController { if(ids.size()>1){ List errs=new ArrayList<>(); List oks=new ArrayList<>(); + String msg=""; for (String id : ids) { XmTaskExecuser xmTaskExecuser=new XmTaskExecuser(); xmTaskExecuser.setTaskId(id); @@ -281,14 +282,19 @@ public class XmTaskController { }else{ oks.add(tips3); } - String msg=""; - if(oks.size()>0){ - msg="成功设置"+oks.size()+"个任务的执行人。"; - } - if(errs.size()>0){ - msg=msg+"以下"+errs.size()+"个任务更新不成功："+errs.stream().map(i->"["+i.get("taskId")+"]"+i.getMsg()).collect(Collectors.joining(";")); - } + + } + Tips returnTips=new Tips(); + + if(errs.size()>0){ + msg="以下"+errs.size()+"个任务更新不成功："+errs.stream().map(i->"["+i.get("taskId")+"]"+i.getMsg()).collect(Collectors.joining(";")); + } + if(oks.size()>0){ + msg="成功设置"+oks.size()+"个任务的执行人。"+msg; + returnTips.setOkMsg(msg); + } + return ResponseHelper.result(returnTips); }else if(ids.size()==1){ XmTaskExecuser xmTaskExecuser=new XmTaskExecuser(); xmTaskExecuser.setTaskId(ids.get(0)); @@ -325,12 +331,13 @@ public class XmTaskController { return ResponseHelper.failed("tasks-0","该任务已不存在"); } if(xmTaskMap.containsKey("createUserid")){ + String createUserid=(String) xmTaskMap.get("createUserid"); + String createUsername=(String) xmTaskMap.get("createUsername"); Set projects=xmTasksDb.stream().map(i->i.getProjectId()).collect(Collectors.toSet()); for (String project : projects) { - tips=groupService.checkIsProjectAdmOrTeamHeadOrAss(user, (String) xmTaskMap.get("createUserid"),project); - if(!tips.isOk()){ - return ResponseHelper.failed("no-qx-0","您无权把任务指派给您的小组成员以外的人。"); - } + if(!groupService.checkUserExistsProjectGroup(project,createUserid)){ + return ResponseHelper.failed("no-qx-0","【"+createUsername+"】不在项目团队中，请先将其拉入项目团队再操作。"); + }; } }