重新生成需求表

xm-core/src/main/java/com/xm/core/ctrl/XmTaskExecuserController.java

@@ -106,6 +106,8 @@ public class XmTaskExecuserController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmTaskExecuser, "ids");
 		PageUtils.startPage(xmTaskExecuser);
+		User user=LoginUtils.getCurrentUserInfo();
+		xmTaskExecuser.put("linkBranchId",user.getBranchId());
 		List<Map<String,Object>>	xmTaskExecuserList = xmTaskExecuserService.selectListMapByWhere(xmTaskExecuser);	//列出XmTaskExecuser列表
 		PageUtils.responePage(m, xmTaskExecuserList);
 		m.put("data",xmTaskExecuserList);
@@ -146,6 +148,8 @@ public class XmTaskExecuserController {
 		Map<String,Object> m = new HashMap<>();
 		RequestUtils.transformArray(xmTaskExecuser, "ids");
 		PageUtils.startPage(xmTaskExecuser);
+		User user=LoginUtils.getCurrentUserInfo();
+		xmTaskExecuser.put("linkBranchId",user.getBranchId());
 		List<Map<String,Object>>	xmTaskExecuserList = xmTaskExecuserService.selectListMapByWhereWithTask(xmTaskExecuser);	//列出XmTaskExecuser列表
 		PageUtils.responePage(m, xmTaskExecuserList);
 		m.put("data",xmTaskExecuserList);

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<Map<String,Object>>	xmTaskSbillDetailList = xmTaskSbillDetailService.selectListMapByWhere(xmTaskSbillDetail);	//列出XmTaskSbillDetail列表
 		PageUtils.responePage(m, xmTaskSbillDetailList);
 		m.put("data",xmTaskSbillDetailList);

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<Map<String,Object>>	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<Map<String,Object>>	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<Map<String,Object>>	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());
 		}

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskExecuserMapper.xml

@@ -13,7 +13,9 @@
          </if>
         <if test="key != null and key !='' ">    and (res.task_name like concat('%',#{key},'%') or res.username like  concat('%',#{key},'%') ) </if>
 		<if test="taskState != null and taskState !='' "> and task_state=#{taskState}</if>
-
+		<if test="linkBranchId!=null and linkBranchId!=''">
+			and (res.branch_id = #{linkBranchId} or res.exec_user_branch_id=#{linkBranchId})
+		</if>
 	</sql>
 	<update id="updateXmTaskExeUseridsAndUsernamesByTaskId"
 			parameterType="String">

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskSbillDetailMapper.xml

@@ -13,6 +13,9 @@
          </if>
         <if test="key != null and key !='' ">       </if>
 		<if test="biz_year!=null and bizYear!=''"> and biz_date like concat(#{bizYear},'%')</if>
+		<if test="linkBranchId!=null and linkBranchId!=''">
+			and (res.branch_id = #{linkBranchId} or res.cp_id=#{linkBranchId})
+		</if>
      </sql>
 	<select id="selectListByUserTasks" parameterType="com.xm.core.vo.BatchJoinToSbillVo" resultType="com.xm.core.entity.XmTaskSbillDetail">
 		select * from xm_task_sbill_detail res

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml

@@ -40,6 +40,9 @@
 		<if test="sbillId!=null and sbillId !=''">
 			AND exists( select 1 from xm_task_sbill_detail d where d.id=res.detail_id and d.sbill_id=#{sbillId})
 		</if>
+		<if test="linkBranchId!=null and linkBranchId!=''">
+			and (res.branch_id = #{linkBranchId} or res.ubranch_id=#{linkBranchId})
+		</if>
     </sql>
 	<update id="updateStatusBySbillIdBySbillDel" parameterType="String">
 		update xm_task_workload res set detail_id=null,sstaus='1'