From 68eee6a94e4e4259627c30c7ce196ea4a0d09c94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 24 Apr 2022 04:17:42 +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      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 7a1447fd..5763f20b 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
@@ -154,8 +154,16 @@
 		sum(if(res.sstatus='4',ifnull(res.workload,0),0)) as had_set_sworkload
 		from xm_task_workload res
 		<where>
-			<include refid="whereForMap"/>
-			<include refid="where"/>
+			<if test="projectId!=null and projectId!=''">
+				and task.project_id=#{projectId}
+			</if>
+			<if test="taskId!=null and taskId!=''">
+				and task.id=#{taskId}
+			</if>
+			<if test="userid!=null and userid!=''">
+				and res.userid=#{userid}
+			</if>
+			and res.sstatus='1'
 			and res.detail_id is null
 		</where>
 		group by res.project_id,res.task_id,res.userid