Merge branch 'dev'

4 years ago · 17b64bb0f1
1 changed files with 1 additions and 1 deletions
--- 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
@ -34,7 +34,7 @@
            ic_party_activity
        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>
        <if test='null != startTime'>