From cc2649b85d7ad1f142f55e4e32e970c1452990d9 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang@test.com>
Date: Wed, 20 Jul 2022 14:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91-?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/epmetuser/IcResiUserDao.xml  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 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 2a0f410795..651c9c806f 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
@@ -114,14 +114,6 @@
             <if test="name != null">
                 and ic_resi_user.NAME like CONCAT('%'#{name}, '%')
             </if>
-
-            <!--   resi规则列表  -->
-            <if test="resiRules != null and resiRules.size() > 0">
-                <foreach collection="resiRules" item="rule">
-                    ${rule.lastLogicalRel} ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal}
-                </foreach>
-            </if>
-
             <!--    房屋id列表      -->
             <if test="houseIds != null and houseIds.size() > 0">
                 and HOME_ID in
@@ -129,6 +121,13 @@
                     #{houseId}
                 </foreach>
             </if>
+            <!--   resi规则列表  -->
+            <if test="resiRules != null and resiRules.size() > 0">
+                and
+                <foreach collection="resiRules" item="rule" open="(" close=")">
+                    ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.lastLogicalRel}
+                </foreach>
+            </if>
         </where>
     </select>