联建活动关联多个单位和服务事项

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