From 8b32fa64c0589243f4d87188d228a7b0cc37b746 Mon Sep 17 00:00:00 2001
From: wjt <wujingtao_t@126.com>
Date: Fri, 8 Dec 2023 17:09:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/main/resources/mapper/ClueMapper.xml   |  8 ++++++--
 admin/src/main/resources/mapper/CustomMapper.xml | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/admin/src/main/resources/mapper/ClueMapper.xml b/admin/src/main/resources/mapper/ClueMapper.xml
index 2f8f00f..1186cab 100644
--- a/admin/src/main/resources/mapper/ClueMapper.xml
+++ b/admin/src/main/resources/mapper/ClueMapper.xml
@@ -54,7 +54,9 @@
 		where DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{qo.createStartTime}
 		and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{qo.createEndTime}
 		and company_id = #{qo.companyId}
-		and channel_type = #{qo.channelType}
+		<if test="qo.channelType!=null">
+			and channel_type = #{qo.channelType}
+		</if>
 		<if test="qo.assignedIdList != null and  qo.assignedIdList.size > 0">
 			and assigned_by in
 			<foreach collection="qo.assignedIdList" open="(" separator="," close=")" item="item">
@@ -82,7 +84,9 @@
 		from tb_clue
 		where DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{qo.createStartTime}
 		and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{qo.createEndTime}
-		and channel_type =#{qo.channelType}
+		<if test="qo.channelType!=null">
+			and channel_type = #{qo.channelType}
+		</if>
 		<if test="qo.distributorId!=null">
 			and create_by = #{qo.distributorId}
 		</if>
diff --git a/admin/src/main/resources/mapper/CustomMapper.xml b/admin/src/main/resources/mapper/CustomMapper.xml
index 3751e83..acaa6a8 100644
--- a/admin/src/main/resources/mapper/CustomMapper.xml
+++ b/admin/src/main/resources/mapper/CustomMapper.xml
@@ -47,7 +47,9 @@
 		where DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{qo.createStartTime}
 		and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{qo.createEndTime}
 		and company_id = #{qo.companyId}
-		and channel_type = #{qo.channelType}
+		<if test="qo.channelType!=null">
+			and channel_type = #{qo.channelType}
+		</if>
 		<if test="qo.enterIdList != null and  qo.enterIdList.size > 0">
 			and create_by in
 			<foreach collection="qo.enterIdList" open="(" separator="," close=")" item="item">
@@ -67,9 +69,11 @@
 		select DATE_FORMAT(create_time, '%Y-%m-%d') as createTime, count(1) as num
 		from tb_custom
 		where DATE_FORMAT(create_time, '%Y-%m-%d') &gt;= #{qo.createStartTime}
-		  and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{qo.createEndTime}
-		  and distributor_id = #{qo.distributorId}
-		  and channel_type = #{qo.channelType}
+		and DATE_FORMAT(create_time, '%Y-%m-%d') &lt;= #{qo.createEndTime}
+		and distributor_id = #{qo.distributorId}
+		<if test="qo.channelType!=null">
+			and channel_type = #{qo.channelType}
+		</if>
 		GROUP BY createTime
 	</select>
 </mapper>