From 08b3fa6c40ece53b09886719806f1731a727e676 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 25 Oct 2022 20:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=BB=9F=E8=AE=A1=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=9F=A5=E8=AF=A2=E6=88=AA=E8=87=B3=E6=98=A8=E5=A4=A9?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE222?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/item/ItemDao.xml     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index 45f7f5803..e06e9e546 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -1096,7 +1096,7 @@
         and item.IS_PEOPLE = '1'
         and item.IS_DIFFICULTY = '1'
         <choose>
-            <when test="startTime != null and startTime != '' and endTime != null and endTime != '">
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </when>
             <otherwise>
@@ -2713,7 +2713,7 @@
         and item.ISSUE_ID is null
         and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
         <choose>
-            <when test="startTime != null and startTime != '' and endTime != null and endTime != '">
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </when>
             <otherwise>
@@ -2743,7 +2743,7 @@
         and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
         and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',2) != '城市综合'
         <choose>
-            <when test="startTime != null and startTime != '' and endTime != null and endTime != '">
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </when>
             <otherwise>
@@ -2777,7 +2777,7 @@
         and item.ISSUE_ID is null
         and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
         <choose>
-            <when test="startTime != null and startTime != '' and endTime != null and endTime != '">
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </when>
             <otherwise>
@@ -2810,7 +2810,7 @@
         and item.ISSUE_ID is null
         and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
         <choose>
-            <when test="startTime != null and startTime != '' and endTime != null and endTime != '">
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </when>
             <otherwise>
@@ -2846,7 +2846,7 @@
         and item.ISSUE_ID is null
         and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
         <choose>
-            <when test="startTime != null and startTime != '' and endTime != null and endTime != '">
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                 AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
             </when>
             <otherwise>
@@ -2933,7 +2933,7 @@
             and item.ISSUE_ID is null
             and SUBSTRING_INDEX(item.CATEGORY_FULL_NAME,'-',1) != '其他'
             <choose>
-                <when test="startTime != null and startTime != '' and endTime != null and endTime != '">
+                <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
                     AND DATE_FORMAT( item.CREATED_TIME, '%Y-%m-%d' ) BETWEEN #{startTime} AND #{endTime}
                 </when>
                 <otherwise>