From 01e3dc01abce9e7bba876181632c5e0c198533cb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 2 Aug 2022 15:59:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?colVal=E5=8F=AF=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
index d9f15f9637..910a5b2e38 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
+++ b/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;
 
     /**

From fa1a116aa454e8c329b20e98b8d9d328632f7d4f Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Tue, 2 Aug 2022 16:11:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE?=
 =?UTF-8?q?=E4=BA=BA=E3=80=91=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5is=5Fnull?=
 =?UTF-8?q?/is=5Fnot=5Fnull?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/epmetuser/IcResiUserDao.xml        | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
index adcb55f269..cc7cf00738 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml
+++ b/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}