From c4b66ebdb934300b5e7f16161fcd46e4c0e89472 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 4 May 2022 15:51:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E5=B7=A5?= =?UTF-8?q?=E6=97=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/ctrl/XmGroupUserController.java | 2 ++ .../com/xm/core/ctrl/XmIterationController.java | 12 ++++++++++-- .../java/com/xm/core/ctrl/XmProductController.java | 13 +++++++++++-- .../java/com/xm/core/ctrl/XmProjectController.java | 6 +++++- .../mapper/xm/core/dao/XmGroupUserMapper.xml | 4 +++- 5 files changed, 31 insertions(+), 6 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java index 2290e4b1..b66ab6d9 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmGroupUserController.java @@ -92,6 +92,8 @@ public class XmGroupUserController { Map m = new HashMap<>(); RequestUtils.transformArray(xmGroupUser, "ids"); PageUtils.startPage(xmGroupUser); + User user=LoginUtils.getCurrentUserInfo(); + xmGroupUser.put("branchId",user.getBranchId()); List> xmGroupUserList = xmGroupUserService.selectListMapByWhere(xmGroupUser); //列出XmProjectGroupUser列表 PageUtils.responePage(m, xmGroupUserList); m.put("data",xmGroupUserList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java index abfdf138..d6700181 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationController.java @@ -107,7 +107,11 @@ public class XmIterationController { xmIteration.put("userid",user.getUserid()); if( !( StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null || StringUtils.hasText(adminUserid) ) ){ - xmIteration.put("compete",user.getUserid()); + if(LoginUtils.isBranchAdmin()){ + xmIteration.put("branchId",user.getBranchId()); + }else{ + xmIteration.put("compete",user.getUserid()); + } } if("branchId".equals(queryScope)){ xmIteration.put("branchId",user.getBranchId()); @@ -141,7 +145,11 @@ public class XmIterationController { xmIteration.put("userid",user.getUserid()); if( !(StringUtils.hasText(branchId)|| StringUtils.hasText(id) || StringUtils.hasText(productId)|| StringUtils.hasText(menuId)||ids!=null || StringUtils.hasText(adminUserid) ) ){ - xmIteration.put("compete",user.getUserid()); + if(LoginUtils.isBranchAdmin()){ + xmIteration.put("branchId",user.getBranchId()); + }else{ + xmIteration.put("compete",user.getUserid()); + } } if("branchId".equals(queryScope)){ xmIteration.put("branchId",user.getBranchId()); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index 6441b5e9..418c98e5 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -103,7 +103,12 @@ public class XmProductController { xmProduct.put("userid",user.getUserid()); if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null ||ids!=null ) ){ - xmProduct.put("compete",user.getUserid()); + if(LoginUtils.isBranchAdmin()){ + xmProduct.put("branchId",user.getBranchId()); + }else{ + xmProduct.put("compete",user.getUserid()); + } + } if(!StringUtils.hasText((String) xmProduct.get("isTpl"))){ xmProduct.put("isTpl","0"); @@ -153,7 +158,11 @@ public class XmProductController { xmProduct.put("userid",user.getUserid()); if( !StringUtils.hasText(queryScope) && !(StringUtils.hasText(id) || StringUtils.hasText(projectId)|| StringUtils.hasText(pmUserid)||ids!=null ||ids!=null ) ){ - xmProduct.put("compete",user.getUserid()); + if(LoginUtils.isBranchAdmin()){ + xmProduct.put("branchId",user.getBranchId()); + }else{ + xmProduct.put("compete",user.getUserid()); + } } if(!StringUtils.hasText((String) xmProduct.get("isTpl"))){ xmProduct.put("isTpl","0"); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java index dbc70859..9c7c5c7f 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectController.java @@ -111,8 +111,12 @@ public class XmProjectController { xmProject.put("userid",user.getUserid()); if( !(StringUtils.hasText(id) || StringUtils.hasText(myFocus)|| StringUtils.hasText(productId)||ids!=null || StringUtils.hasText(myExecuserStatus)||pgTypeIds!=null|| StringUtils.hasText(createUserid)) ){ + if(LoginUtils.isBranchAdmin()){ + xmProject.put("branchId",user.getBranchId()); + }else { + xmProject.put("compete",user.getUserid()); + } - xmProject.put("compete",user.getUserid()); } if(!StringUtils.hasText((String) xmProject.get("isTpl"))){ xmProject.put("isTpl","0"); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml index 79e395bd..5f8c1505 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmGroupUserMapper.xml @@ -11,7 +11,9 @@ ( #{item.groupId}, #{item.userid}) - + + and (g.branch_id=#{branchId} or g.crow_branch_id=#{branchId}) + and g.group_name like concat('%',#{groupNameKey},'%') and (g.leader_username like concat('%',#{mngUsernamekey},'%') or g.ass_username like concat('%',#{mngUsernamekey},'%')) and res.username like concat('%',#{groupUsernameKey},'%')