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 82a36c58..3167b7d5 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 @@ -106,6 +106,8 @@ public class XmTaskExecuserController { Map m = new HashMap<>(); RequestUtils.transformArray(xmTaskExecuser, "ids"); PageUtils.startPage(xmTaskExecuser); + User user=LoginUtils.getCurrentUserInfo(); + xmTaskExecuser.put("linkBranchId",user.getBranchId()); List> xmTaskExecuserList = xmTaskExecuserService.selectListMapByWhere(xmTaskExecuser); //列出XmTaskExecuser列表 PageUtils.responePage(m, xmTaskExecuserList); m.put("data",xmTaskExecuserList); @@ -146,6 +148,8 @@ public class XmTaskExecuserController { Map m = new HashMap<>(); RequestUtils.transformArray(xmTaskExecuser, "ids"); PageUtils.startPage(xmTaskExecuser); + User user=LoginUtils.getCurrentUserInfo(); + xmTaskExecuser.put("linkBranchId",user.getBranchId()); List> xmTaskExecuserList = xmTaskExecuserService.selectListMapByWhereWithTask(xmTaskExecuser); //列出XmTaskExecuser列表 PageUtils.responePage(m, xmTaskExecuserList); m.put("data",xmTaskExecuserList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java index e57dd24b..3f2f3470 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillDetailController.java @@ -72,7 +72,7 @@ public class XmTaskSbillDetailController { RequestUtils.transformArray(xmTaskSbillDetail, "ids"); PageUtils.startPage(xmTaskSbillDetail); User user=LoginUtils.getCurrentUserInfo(); - xmTaskSbillDetail.put("branchId",user.getBranchId()); + xmTaskSbillDetail.put("linkBranchId",user.getBranchId()); List> xmTaskSbillDetailList = xmTaskSbillDetailService.selectListMapByWhere(xmTaskSbillDetail); //列出XmTaskSbillDetail列表 PageUtils.responePage(m, xmTaskSbillDetailList); m.put("data",xmTaskSbillDetailList); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java index 0060489b..06ebc49e 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java @@ -94,7 +94,7 @@ public class XmTaskWorkloadController { String projectId= (String) xmTaskWorkload.get("projectId"); String userid= (String) xmTaskWorkload.get("userid"); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("branchId",user.getBranchId()); + xmTaskWorkload.put("linkBranchId",user.getBranchId()); List> xmTaskWorkloadList = xmTaskWorkloadService.selectListMapByWhere(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -112,7 +112,7 @@ public class XmTaskWorkloadController { Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTaskWorkload); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("branchId",user.getBranchId()); + xmTaskWorkload.put("linkBranchId",user.getBranchId()); List> xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetDay(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -132,7 +132,7 @@ public class XmTaskWorkloadController { Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTaskWorkload); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("branchId",user.getBranchId()); + xmTaskWorkload.put("linkBranchId",user.getBranchId()); List> xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetMonth(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -155,7 +155,7 @@ public class XmTaskWorkloadController { RequestUtils.transformArray( xmTaskWorkload, "sstatuses"); PageUtils.startPage(xmTaskWorkload); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("branchId",user.getBranchId()); + xmTaskWorkload.put("linkBranchId",user.getBranchId()); String queryScope= (String) xmTaskWorkload.get("queryScope"); if("my".equals(queryScope)){ xmTaskWorkload.put("userid",user.getUserid()); @@ -182,7 +182,7 @@ public class XmTaskWorkloadController { PageUtils.startPage(xmTaskWorkload); String queryScope= (String) xmTaskWorkload.get("queryScope"); User user=LoginUtils.getCurrentUserInfo(); - xmTaskWorkload.put("branchId",user.getBranchId()); + xmTaskWorkload.put("linkBranchId",user.getBranchId()); if("my".equals(queryScope)){ xmTaskWorkload.put("userid",user.getUserid()); } diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml index d1af1141..cb9a9bd7 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml @@ -13,7 +13,9 @@ and (res.task_name like concat('%',#{key},'%') or res.username like concat('%',#{key},'%') ) and task_state=#{taskState} - + + and (res.branch_id = #{linkBranchId} or res.exec_user_branch_id=#{linkBranchId}) + diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml index a0bbe787..b94ea13e 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml @@ -13,6 +13,9 @@ and biz_date like concat(#{bizYear},'%') + + and (res.branch_id = #{linkBranchId} or res.cp_id=#{linkBranchId}) +