From 58c6225e3237b8e0a619a8e28adba1901b16c92a Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 18 Jul 2022 09:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B1=85=E6=B0=91=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=85=9A=E7=BB=84=E7=BB=87=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 25 -------------------
 1 file changed, 25 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 810015eab3..0c2cb4fde7 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
@@ -293,18 +293,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 //2022.04.19 end
                 //2022.05.18 start zhaoqf 党员信息同步
                 if (map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY"))) {
-                    if (formMap.containsKey("ic_party_member")) {
-                        for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
-                            if (!hash.containsKey("SSZB")) {
-                                String errorMsg = "党员信息所属支部不能为空";
-                                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-                            }
-                        }
-                    } else {
-                        String errorMsg = "党员信息所属支部不能为空";
-                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-                    }
-
                     partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
                     partyMemberDTO.setAgencyId(agencyId);
                     partyMemberDTO.setAgencyPids(result.getData().getPids());
@@ -521,19 +509,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 resiUserId = map.get("ID");
                 //2022.05.18 start zhaoqf 党员信息同步
                 IcResiUserEntity icResiUser = baseDao.selectById(resiUserId);
-                if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY")))) {
-                    if (formMap.containsKey("ic_party_member")) {
-                        for (LinkedHashMap<String, String> hash : formMap.get("ic_party_member")) {
-                            if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
-                                String errorMsg = "党员信息所属支部不能为空";
-                                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-                            }
-                        }
-                    } else {
-                        String errorMsg = "党员信息所属支部不能为空";
-                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-                    }
-                }
                 if ((map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(map.get("IS_PARTY")))
                         || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) {
                     partyMemberDTO.setCustomerId(tokenDto.getCustomerId());