Merge branch 'dev_shibei_user' into master_shibei

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/handler/IcResiImportDynamicExcelListener.java

@@ -195,10 +195,10 @@ public class IcResiImportDynamicExcelListener extends AnalysisEventListener<Map<
                 SendMqMsgUtil.build()
                         .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class))
                         .sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, msg);
-            } else if (sheetEnumObject == IcResiUserTableEnum.IC_PARTY_MEMBER && !CollectionUtils.isEmpty(successIdCards)) {
+            } /*else if (sheetEnumObject == IcResiUserTableEnum.IC_PARTY_MEMBER && !CollectionUtils.isEmpty(successIdCards)) {
                 // 针对党员，需要发送mq消息，同步到党员库
                 icResiUserImportService.syncPartyMemberInfo(successIdCards);
-            }
+            }*/
         }
         dataList.clear();
     }

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());