From 486da89d34ddf9f6200e86854c31fc24c2688880 Mon Sep 17 00:00:00 2001
From: qushutong <1976590620@qq.com>
Date: Fri, 22 Sep 2023 15:12:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=B5=81=E5=8A=A8=20=E5=B8=B8=E4=BD=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java  | 6 +++---
 .../src/main/resources/mapper/IcResiUserDao.xml             | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index d17d25731e..dc78503276 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -2221,10 +2221,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         AtomicInteger ldUserTotal = new AtomicInteger();
         list.forEach(l -> {
             userTotal.addAndGet(l.getNum());
-            if ("0".equals(l.getIsFloating())) {
-                czUserTotal.addAndGet(l.getNum());
-            } else {
+            if ("liudongrenkou".equals(l.getIsFloating())) {
                 ldUserTotal.addAndGet(l.getNum());
+            } else {
+                czUserTotal.addAndGet(l.getNum());
             }
         });
         resultDTO.setUserTotal(userTotal.get());
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 f296de4674..6bacc2e653 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
@@ -1171,7 +1171,7 @@
     <select id="userChart" resultType="com.epmet.dto.result.UserChartResultDTO">
         SELECT
             COUNT(id) num,
-            is_floating isFloating
+            populationType isFloating
         FROM
             ic_resi_user
         WHERE
@@ -1198,7 +1198,7 @@
                 AND village_id = #{orgId}
             </otherwise>
         </choose>
-        GROUP BY is_floating
+        GROUP BY populationType
     </select>
     <select id="getResiUserGroupHomeId" resultMap="homeMemberList">
         SELECT