diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java index b61fb755..bc2a3aba 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmEnvListController.java @@ -70,6 +70,9 @@ public class XmEnvListController { Map m = new HashMap<>(); RequestUtils.transformArray(xmEnvList, "ids"); PageUtils.startPage(xmEnvList); + User user=LoginUtils.getCurrentUserInfo(); + xmEnvList.put("userid",user.getUserid()); + xmEnvList.put("branchId",user.getBranchId()); List> xmEnvListList = xmEnvListService.selectListMapByWhere(xmEnvList); //列出XmEnvList列表 PageUtils.responePage(m, xmEnvListList); m.put("data",xmEnvListList); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml index 854cc6fb..5aff07dd 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml @@ -18,6 +18,7 @@ and exists( select 1 from xm_product_project_link l where l.product_id=#{linkProductId} and l.project_id=res.project_id) + and ((res.create_userid=#{userid} and res.read_qx='9') or (res.branch_id=#{branchId} and res.read_qx='1') or res.read_qx in ('0','2'))