From 34fcf4fb1ac5235edde0b1c124cecdba01bfc0b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 30 Apr 2022 17:42:15 +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

---
 .../mapper/xm/core/dao/XmTaskWorkloadMapper.xml   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
index 862407b3..c69ed97b 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml
@@ -132,6 +132,9 @@
 			<if test="userid!=null and userid!=''">
 				and res.userid=#{userid}
 			</if>
+			<if test="branchId!=null and branchId!=''">
+				and task.cbranch_id=#{branchId}
+			</if>
 		</where>
 
 	</select>
@@ -163,6 +166,12 @@
 			<if test="userid!=null and userid!=''">
 				and res.userid=#{userid}
 			</if>
+			<if test="branchId!=null and branchId!=''">
+				and res.branch_id=#{branchId}
+			</if>
+			<if test="ubranchId!=null and ubranchId!=''">
+				and res.ubranch_id=#{ubranchId}
+			</if>
 			<if test="userTasks!=null">
 				and (res.userid,res.task_id) in
 				<foreach collection="userTasks" item="item" index="index" open="(" separator="," close=")" >
@@ -186,6 +195,12 @@
 			<if test="userid!=null and userid!=''">
 				and res.userid=#{userid}
 			</if>
+			<if test="branchId!=null and branchId!=''">
+				and e.branch_id=#{branchId}
+			</if>
+			<if test="ubranchId!=null and ubranchId!=''">
+				and e.exec_user_branch_id=#{ubranchId}
+			</if>
 		</where>
 
 	</select>