From 0124781a05212b28231b261e9eb9b1a4531f85c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 30 Apr 2022 17:11:26 +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 --- .../java/com/xm/core/ctrl/XmTaskSbillController.java | 2 ++ .../java/com/xm/core/ctrl/XmTaskWorkloadController.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java index 88a0ae57..5d43c1ce 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskSbillController.java @@ -84,6 +84,8 @@ public class XmTaskSbillController { Tips tips=new Tips("查询成功"); RequestUtils.transformArray(xmTaskSbill, "ids"); PageUtils.startPage(xmTaskSbill); + User user=LoginUtils.getCurrentUserInfo(); + xmTaskSbill.put("branchId",user.getBranchId()); List> xmTaskSbillList = xmTaskSbillService.selectListMapByWhere(xmTaskSbill); //列出XmTaskSbill列表 PageUtils.responePage(m, xmTaskSbillList); m.put("data",xmTaskSbillList); 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 36464182..7b0ed096 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,6 +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()); List> xmTaskWorkloadList = xmTaskWorkloadService.selectListMapByWhere(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -110,6 +111,8 @@ public class XmTaskWorkloadController { Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTaskWorkload); + User user=LoginUtils.getCurrentUserInfo(); + xmTaskWorkload.put("branchId",user.getBranchId()); List> xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetDay(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -128,6 +131,8 @@ public class XmTaskWorkloadController { Map m = new HashMap<>(); Tips tips=new Tips("查询成功"); PageUtils.startPage(xmTaskWorkload); + User user=LoginUtils.getCurrentUserInfo(); + xmTaskWorkload.put("branchId",user.getBranchId()); List> xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetMonth(xmTaskWorkload); //列出XmTaskWorkload列表 PageUtils.responePage(m, xmTaskWorkloadList); m.put("data",xmTaskWorkloadList); @@ -149,8 +154,9 @@ public class XmTaskWorkloadController { RequestUtils.transformArray( xmTaskWorkload, "wstatuses"); RequestUtils.transformArray( xmTaskWorkload, "sstatuses"); PageUtils.startPage(xmTaskWorkload); - String queryScope= (String) xmTaskWorkload.get("queryScope"); User user=LoginUtils.getCurrentUserInfo(); + xmTaskWorkload.put("branchId",user.getBranchId()); + String queryScope= (String) xmTaskWorkload.get("queryScope"); if("my".equals(queryScope)){ xmTaskWorkload.put("userid",user.getUserid()); } @@ -176,6 +182,7 @@ public class XmTaskWorkloadController { PageUtils.startPage(xmTaskWorkload); String queryScope= (String) xmTaskWorkload.get("queryScope"); User user=LoginUtils.getCurrentUserInfo(); + xmTaskWorkload.put("branchId",user.getBranchId()); if("my".equals(queryScope)){ xmTaskWorkload.put("userid",user.getUserid()); }