重新生成工时表

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<Map<String,Object>>	xmTaskSbillList = xmTaskSbillService.selectListMapByWhere(xmTaskSbill);	//列出XmTaskSbill列表
 		PageUtils.responePage(m, xmTaskSbillList);
 		m.put("data",xmTaskSbillList);

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<Map<String,Object>>	xmTaskWorkloadList = xmTaskWorkloadService.selectListMapByWhere(xmTaskWorkload);	//列出XmTaskWorkload列表
 		PageUtils.responePage(m, xmTaskWorkloadList);
 		m.put("data",xmTaskWorkloadList);
@@ -110,6 +111,8 @@ public class XmTaskWorkloadController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		PageUtils.startPage(xmTaskWorkload);
+		User user=LoginUtils.getCurrentUserInfo();
+		xmTaskWorkload.put("branchId",user.getBranchId());
 		List<Map<String,Object>>	xmTaskWorkloadList = xmTaskWorkloadService.listProjectWorkloadSetDay(xmTaskWorkload);	//列出XmTaskWorkload列表
 		PageUtils.responePage(m, xmTaskWorkloadList);
 		m.put("data",xmTaskWorkloadList);
@@ -128,6 +131,8 @@ public class XmTaskWorkloadController {
 		Map<String,Object> m = new HashMap<>();
 		Tips tips=new Tips("查询成功");
 		PageUtils.startPage(xmTaskWorkload);
+		User user=LoginUtils.getCurrentUserInfo();
+		xmTaskWorkload.put("branchId",user.getBranchId());
 		List<Map<String,Object>>	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());
 		}