党建积分列表调整

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -179,14 +179,22 @@
 	            AND SOURCE_TYPE = #{type}
 	        </if>
 	        <if test='"1" == dateType'>
-	            AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate}
+                <if test="startDate != null and startDate != '' ">
+                    AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate}
+                </if>
 	        </if>
 	        <if test='"2" == dateType'>
-	            AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate}
+                <if test="startDate != null and startDate != '' ">
+	                AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate}
+                </if>
 	        </if>
 	        <if test='"3" == dateType'>
-	            AND DATE_FORMAT(CREATED_TIME,'%Y%m') &gt;= #{startDate}
-	            AND DATE_FORMAT(CREATED_TIME,'%Y%m') &lt;= #{endDate}
+                <if test="startDate != null and startDate != '' ">
+	                AND DATE_FORMAT(CREATED_TIME,'%Y%m') &gt;= #{startDate}
+                </if>
+                <if test="endDate != null and endDate != '' ">
+                    AND DATE_FORMAT(CREATED_TIME,'%Y%m') &lt;= #{endDate}
+                </if>
 	        </if>
         ORDER BY
             CREATED_TIME DESC