Merge branch 'dev_party_mange'

3 years ago · 300ab5441c
1 changed files with 3 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
@ -163,7 +163,9 @@
            <if test='null != endTime'>
                AND ACTIVITY_TIME &lt;= #{endTime}
            </if>
-            AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+            <if test='null != startTime and null != endTime'>
+                AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+            </if>

    </select>