From 304fd62c86037e75ab9202dac8810dc30c3e1079 Mon Sep 17 00:00:00 2001
From: sunyuchao <SunYuChao123>
Date: Thu, 8 Sep 2022 10:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E9=98=B2=E6=A6=82=E8=A7=88=E4=B8=8B?=
 =?UTF-8?q?=E9=92=BB=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcHouseDao.xml              | 2 +-
 .../src/main/resources/mapper/IcResiUserDao.xml           | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index 8b443733ea..5cfdd0fd4d 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -629,7 +629,7 @@
                 )
             </otherwise>
         </choose>
-        GROUP BY
+        ORDER BY
             a.sort,
             CONVERT(c.NEIGHBOR_HOOD_NAME using gbk),
             CONVERT(b.BUILDING_NAME USING gbk),
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
index a32b2741a6..3732fbfd5d 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
@@ -1313,6 +1313,12 @@
             del_flag = '0'
         AND status = '0'
         AND customer_id = #{customerId}
+        <if test='null != type and type.trim() != "" and type == "cz" '>
+            AND is_floating = '0'
+        </if>
+        <if test='null != type and type.trim() != "" and type == "ld" '>
+            AND (is_floating != '0' or is_floating is null)
+        </if>
         <choose>
             <when test='orgType == "agency"'>
                 AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%'))
@@ -1334,7 +1340,7 @@
                 AND village_id = #{orgId}
             </otherwise>
         </choose>
-        GROUP BY `name` ASC
+        ORDER BY `name` ASC
     </select>
 
 </mapper>