From 135ace7c369dfc66f33ec42ac227ac76ee4c974d Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 22 Feb 2022 16:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=BB=BA=E6=B4=BB=E5=8A=A8=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E5=A4=9A=E4=B8=AA=E5=8D=95=E4=BD=8D=E5=92=8C=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E4=BA=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcPartyActivityDao.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
index fb7912f42d..429461fbfb 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPartyActivityDao.xml
@@ -36,7 +36,7 @@
         INNER JOIN ic_activity_service_relation c ON a.ID = c.ACTIVITY_ID
         WHERE a.DEL_FLAG = '0'
         AND (a.AGENCY_ID = #{agencyId} OR a.PIDS LIKE concat( '%', #{agencyId}, '%' ))
-        <if test='null != serviceMatter'>
+        <if test='null != serviceMatter and "" != serviceMatter'>
            AND c.SERVICE_MATTER = #{serviceMatter}
         </if>
         <if test='null != startTime'>
@@ -71,7 +71,7 @@
             WHERE
                 DEL_FLAG = '0'
                 AND AGENCY_ID = #{agencyId}
-                <if test='null != unitId'>
+                <if test='null != unitId and "" != unitId'>
                     AND UNIT_ID = #{unitId}
                 </if>
             GROUP BY
@@ -86,7 +86,7 @@
             WHERE
                 DEL_FLAG = '0'
                 AND AGENCY_ID = #{agencyId}
-                <if test='null != serviceMatter'>
+                <if test='null != serviceMatter and "" != serviceMatter'>
                     AND SERVICE_MATTER = #{serviceMatter}
                 </if>
             GROUP BY
@@ -95,7 +95,7 @@
         WHERE
             a.DEL_FLAG = '0'
             AND a.AGENCY_ID = #{agencyId}
-            <if test='null != serviceMatter'>
+            <if test='null != title and "" != title'>
                 AND TITLE LIKE concat('%', #{title}, '%')
             </if>
             AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
@@ -127,7 +127,7 @@
             WHERE
                 DEL_FLAG = '0'
                 AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
-                <if test='null != unitId'>
+                <if test='null != unitId and "" != unitId'>
                     AND UNIT_ID = #{unitId}
                 </if>
             GROUP BY
@@ -142,7 +142,7 @@
             WHERE
                 DEL_FLAG = '0'
                 AND (AGENCY_ID = #{agencyId} OR PIDS LIKE concat( '%', #{agencyId}, '%' ))
-                <if test='null != serviceMatter'>
+                <if test='null != serviceMatter and "" != serviceMatter'>
                     AND SERVICE_MATTER = #{serviceMatter}
                 </if>
             GROUP BY