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] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=83=9F=E5=8F=B0=E4=B8=8D?=
 =?UTF-8?q?=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);
                                 }