From 399b6565992c326d779f58a4b4adc5a9248702cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 7 Jul 2022 00:53:50 +0800 Subject: [PATCH] task_order --- .../core/ctrl/XmTaskExecuserController.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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 b37b773b..c30dabb1 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 @@ -108,7 +108,16 @@ public class XmTaskExecuserController { RequestUtils.transformArray(xmTaskExecuser, "ids"); PageUtils.startPage(xmTaskExecuser); User user=LoginUtils.getCurrentUserInfo(); - xmTaskExecuser.put("linkBranchId",user.getBranchId()); + String projectId= (String) xmTaskExecuser.get("projectId"); + if(StringUtils.hasText(projectId)){ + if(!groupService.checkUserExistsGroup(projectId,user.getUserid())){ + xmTaskExecuser.put("linkBranchId",user.getBranchId()); + } + }else{ + xmTaskExecuser.put("linkBranchId",user.getBranchId()); + } + + List> xmTaskExecuserList = xmTaskExecuserService.selectListMapByWhere(xmTaskExecuser); //列出XmTaskExecuser列表 PageUtils.responePage(m, xmTaskExecuserList); m.put("data",xmTaskExecuserList); @@ -150,7 +159,14 @@ public class XmTaskExecuserController { RequestUtils.transformArray(xmTaskExecuser, "ids"); PageUtils.startPage(xmTaskExecuser); User user=LoginUtils.getCurrentUserInfo(); - xmTaskExecuser.put("linkBranchId",user.getBranchId()); + String projectId= (String) xmTaskExecuser.get("projectId"); + if(StringUtils.hasText(projectId)){ + if(!groupService.checkUserExistsGroup(projectId,user.getUserid())){ + xmTaskExecuser.put("linkBranchId",user.getBranchId()); + } + }else{ + xmTaskExecuser.put("linkBranchId",user.getBranchId()); + } List> xmTaskExecuserList = xmTaskExecuserService.selectListMapByWhereWithTask(xmTaskExecuser); //列出XmTaskExecuser列表 PageUtils.responePage(m, xmTaskExecuserList); m.put("data",xmTaskExecuserList);