From 4368a90a1373adb19d1a6c226b43d6c96075cffb Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 9 Jun 2022 15:19:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=98=AF=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=89=80=E5=B1=9E=E6=94=AF=E9=83=A8=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcResiUserServiceImpl.java   | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 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 47d5728dca..91f8e01f0a 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
@@ -218,10 +218,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if (NumConstant.ONE_STR.equals(hash.get("IS_DYZXH"))) {
                     isDyzxh = true;
                 }
-                if (!hash.containsKey("SSZB")) {
-                    String errorMsg = "党员信息所属支部不能为空";
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-                }
             }
         }
         for (IcResiUserFormDTO d : formDTO) {
@@ -276,6 +272,18 @@ 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());
@@ -438,10 +446,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 if (NumConstant.ONE_STR.equals(hash.get("IS_DYZXH"))) {
                     isDyzxh = true;
                 }
-                if (!hash.containsKey("ID") && !hash.containsKey("SSZB")) {
-                    String errorMsg = "党员信息所属支部不能为空";
-                    throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
-                }
             }
         }
         for (IcResiUserFormDTO d : formDTO) {
@@ -480,6 +484,19 @@ 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());