Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform

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

@@ -129,8 +129,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                 map.put("customer_id", tokenDto.getCustomerId());
                 map.put("created_by", tokenDto.getUserId());
                 map.put("updated_by", tokenDto.getUserId());
+                if(!map.containsKey("AGENCY_ID")){
+                    throw new RenException("新增居民信息--入参AGENCY_ID为空");
+                }
                 //查询组织信息
-                String agencyId = (null == map.get("AGENCY_ID") ? map.get("agency_id") : map.get("AGENCY_ID"));
+                String agencyId = map.get("AGENCY_ID");
                 Result<CustomerAgencyDTO> result = govOrgOpenFeignClient.getAgencyById(agencyId);
                 if (result.success() && null != result.getData()) {
                     map.put("pids", result.getData().getPids());