|
|
@ -1375,8 +1375,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
break; |
|
|
|
case UserDemandConstant.IC_USER_VOLUNTEER: |
|
|
|
resDto.setServiceUnitName(StrConstant.EPMETY_STR); |
|
|
|
resDto.setServiceUserName(icUerInfoMap.get(resDto.getServerId()).getName()); |
|
|
|
resDto.setServiceUserMobile(icUerInfoMap.get(resDto.getServerId()).getMobile()); |
|
|
|
resDto.setServiceUserName(MapUtils.isNotEmpty(icUerInfoMap) && icUerInfoMap.containsKey(resDto.getServerId()) ? icUerInfoMap.get(resDto.getServerId()).getName() : StrConstant.EPMETY_STR); |
|
|
|
resDto.setServiceUserMobile(MapUtils.isNotEmpty(icUerInfoMap) && icUerInfoMap.containsKey(resDto.getServerId()) ? icUerInfoMap.get(resDto.getServerId()).getMobile() : StrConstant.EPMETY_STR); |
|
|
|
break; |
|
|
|
default: |
|
|
|
log.warn("serviceType 错误"); |
|
|
@ -1449,7 +1449,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
if (CollectionUtils.isNotEmpty(icUserIdList)) { |
|
|
|
Result<List<IcResiUserDTO>> icUserInfoRes = epmetUserOpenFeignClient.getListIcResiUserDTO(new ArrayList<>(icUserIdList)); |
|
|
|
if (!icUserInfoRes.success() || CollectionUtils.isEmpty(icUserInfoRes.getData())) { |
|
|
|
throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); |
|
|
|
// throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常");
|
|
|
|
log.warn("查询居民信息志愿者信息异常:icUserIdList:"+JSON.toJSONString(icUserIdList)); |
|
|
|
return icUserInfoMap; |
|
|
|
} |
|
|
|
icUserInfoMap = icUserInfoRes.getData().stream().collect(Collectors.toMap(IcResiUserDTO::getId, o -> o, (o1, o2) -> o1)); |
|
|
|
} |
|
|
@ -1503,8 +1505,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD |
|
|
|
case UserDemandConstant.IC_USER_VOLUNTEER: |
|
|
|
Map<String, IcResiUserDTO> icUserInfoMap = getIcVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId()))); |
|
|
|
resDto.setServiceUnitName(StrConstant.EPMETY_STR); |
|
|
|
resDto.setServiceUserName(icUserInfoMap.get(resDto.getServerId()).getName()); |
|
|
|
resDto.setServiceUserMobile(icUserInfoMap.get(resDto.getServerId()).getMobile()); |
|
|
|
resDto.setServiceUserName(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getName() : StrConstant.EPMETY_STR); |
|
|
|
resDto.setServiceUserMobile(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getMobile() : StrConstant.EPMETY_STR); |
|
|
|
break; |
|
|
|
default: |
|
|
|
log.warn("serviceType 错误"); |
|
|
|