Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 市北master

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml

@@ -116,13 +116,24 @@
             <if test="resiRules != null and resiRules.size() > 0">
                 and
                 <foreach collection="resiRules" item="rule" open="(" close=")">
-                    ${rule.colTable}.${rule.colKey} ${rule.queryType}
                     <choose>
-                        <when test="rule.queryType == 'like'">
-                            CONCAT('%',#{rule.colVal} ,'%')
+                        <!--针对为空/不为空进行单独处理-->
+                        <when test="rule.queryType == 'is_null'">
+                            (${rule.colTable}.${rule.colKey} is null or ${rule.colTable}.${rule.colKey} = '')
+                        </when>
+                        <when test="rule.queryType == 'is_not_null'">
+                            (${rule.colTable}.${rule.colKey} is not null and ${rule.colTable}.${rule.colKey} != '')
                         </when>
                         <otherwise>
-                            #{rule.colVal}
+                            ${rule.colTable}.${rule.colKey} ${rule.queryType}
+                            <choose>
+                                <when test="rule.queryType == 'like'">
+                                    CONCAT('%',#{rule.colVal} ,'%')
+                                </when>
+                                <otherwise>
+                                    #{rule.colVal}
+                                </otherwise>
+                            </choose>
                         </otherwise>
                     </choose>
                     ${rule.nextLogicalRel}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java

@@ -64,7 +64,7 @@ public class IcPolicyRuleDetailDTO {
     /**
      * 参数值
      */
-    @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class})
+    // @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class})
     private String colVal;
 
     /**