志愿者变更mq

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -231,7 +231,7 @@ public class IcResiUserController implements ResultDataResolver {
      */
     private void sendVolunteerMsg(String customerId, String resiUserId) {
         //发送志愿者人员消息变动
-        boolean flag = SendMqMsgUtil.build().sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, new MqBaseFormDTO(customerId, resiUserId));
+        boolean flag = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendRocketMqMsg(SystemMessageType.VOLUNTEER_CHANGED, new MqBaseFormDTO(customerId, resiUserId));
         if (!flag){
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"发送志愿者变动消息失败","发送志愿者变动消息失败");
         }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -253,6 +253,7 @@ 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"))) {
                     partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
                     partyMemberDTO.setAgencyId(agencyId);
                     partyMemberDTO.setAgencyPids(result.getData().getPids());
@@ -270,6 +271,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                                 .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
                         partyMemberDTO.setAddress(address);
                     }
+                }
                 //2022.05.18 end zhaoqf
             }
         }
@@ -305,10 +307,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
             //2022.05.18 end zhaoqf
         });
+        if (StringUtils.isNotBlank(partyMemberDTO.getIcResiUser())) {
             Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
             if (!syncResult.success()) {
                 log.error("同步党员信息失败");
             }
+        }
         //3.变更记录表和变更记录明细表新增数据
         saveUserChangeRecord(tokenDto,map,resiUserId,name);
 
@@ -434,6 +438,8 @@ 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")))
+                    || (!map.containsKey("IS_PARTY") && NumConstant.ONE_STR.equals(icResiUser.getIsParty()))) {
                     partyMemberDTO.setCustomerId(tokenDto.getCustomerId());
                     partyMemberDTO.setAgencyId(icResiUser.getAgencyId());
                     partyMemberDTO.setAgencyPids(icResiUser.getPids());
@@ -475,6 +481,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                                 .concat(StrConstant.HYPHEN).concat(houseInfo.getHouseName());
                         partyMemberDTO.setAddress(address);
                     }
+                }
                 //2022.05.18 end zhaoqf
             }
         }
@@ -532,10 +539,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             }
             //2022.05.18 end zhaoqf
         });
+        if (StringUtils.isNotBlank(partyMemberDTO.getIcResiUser())) {
             Result syncResult = resiPartyMemberOpenFeignClient.icPartyMemberSync(partyMemberDTO);
             if (!syncResult.success()) {
                 log.error("同步党员信息失败");
             }
+        }
         return resiUserId;
     }