From 628db2868f8970adcd4329b6ab6e0f39a23f6480 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Wed, 18 Oct 2023 09:48:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DPOPULATION=5FTYPE?=
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 6a593931e4..f6802eb748 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..aa2c5c08a3 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
+        POPULATION_TYPE isFloating
         FROM
             ic_resi_user
         WHERE
@@ -1198,7 +1198,7 @@
                 AND village_id = #{orgId}
             </otherwise>
         </choose>
-        GROUP BY is_floating
+        GROUP BY POPULATION_TYPE
     </select>
     <select id="getResiUserGroupHomeId" resultMap="homeMemberList">
         SELECT

From 615bcfe57d04291a03d16f62f047cc75f3649d97 Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Thu, 19 Oct 2023 15:06:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=83=9F=E5=8F=B0?=
 =?UTF-8?q?=E4=B8=8D=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 20 ++++++++++++++-----
 1 file changed, 15 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 f6802eb748..f6f028888a 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
@@ -384,7 +384,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
                             if (!hash.containsKey("SSZB")) {
                                 // 10.26灵山卫的暂时放开，不校验
-                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                                // yantai 1535072605621841922 暂时放开，不校验
+                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())&&
+                                        !"1535072605621841922".equals(tokenDto.getCustomerId())){
                                     String errorMsg = "党员信息所属支部不能为空";
                                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                                 }
@@ -392,7 +394,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         }
                     } else {
                         // 10.26灵山卫的暂时放开，不校验
-                        if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                        // yantai 1535072605621841922 暂时放开，不校验
+                        if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())&&
+                                !"1535072605621841922".equals(tokenDto.getCustomerId())){
                             String errorMsg = "党员信息所属支部不能为空";
                             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                         }
@@ -624,7 +628,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
                             if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
                                 // 10.26灵山卫的暂时放开，不校验
-                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                                // yantai 1535072605621841922 暂时放开，不校验
+                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())&&
+                                        !"1535072605621841922".equals(tokenDto.getCustomerId())){
                                     String errorMsg = "党员信息所属支部不能为空";
                                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                                 }
@@ -632,7 +638,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         }
                     } else {
                         // 10.26灵山卫的暂时放开，不校验
-                        if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                        // yantai 1535072605621841922 暂时放开，不校验
+                        if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())&&
+                                !"1535072605621841922".equals(tokenDto.getCustomerId())){
                             String errorMsg = "党员信息所属支部不能为空";
                             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                         }
@@ -642,7 +650,9 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                         for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
                             if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
                                 // 10.26灵山卫的暂时放开，不校验
-                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())){
+                                // yantai 1535072605621841922 暂时放开，不校验
+                                if(!"57eaadaab264b816e7159c1a91ac50c1".equals(tokenDto.getCustomerId())&&
+                                        !"1535072605621841922".equals(tokenDto.getCustomerId())){
                                     String errorMsg = "党员信息所属支部不能为空";
                                     throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                                 }