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);