luyan
/
epmet-cloud-rizhao0920
forked from rongchao/epmet-cloud-rizhao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

查询居民信息志愿者信息异常

dev
yinzuomei 3 years ago
parent
5d4d408f82
commit
9656f898f0
1 changed files with 7 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

12
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java
View File

@ -1375,8 +1375,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
break; break;
case UserDemandConstant.IC_USER_VOLUNTEER: case UserDemandConstant.IC_USER_VOLUNTEER:
resDto.setServiceUnitName(StrConstant.EPMETY_STR); resDto.setServiceUnitName(StrConstant.EPMETY_STR);
resDto.setServiceUserName(icUerInfoMap.get(resDto.getServerId()).getName()); resDto.setServiceUserName(MapUtils.isNotEmpty(icUerInfoMap) && icUerInfoMap.containsKey(resDto.getServerId()) ? icUerInfoMap.get(resDto.getServerId()).getName() : StrConstant.EPMETY_STR);
resDto.setServiceUserMobile(icUerInfoMap.get(resDto.getServerId()).getMobile()); resDto.setServiceUserMobile(MapUtils.isNotEmpty(icUerInfoMap) && icUerInfoMap.containsKey(resDto.getServerId()) ? icUerInfoMap.get(resDto.getServerId()).getMobile() : StrConstant.EPMETY_STR);
break; break;
default: default:
log.warn("serviceType 错误"); log.warn("serviceType 错误");
@ -1449,7 +1449,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
if (CollectionUtils.isNotEmpty(icUserIdList)) { if (CollectionUtils.isNotEmpty(icUserIdList)) {
Result<List<IcResiUserDTO>> icUserInfoRes = epmetUserOpenFeignClient.getListIcResiUserDTO(new ArrayList<>(icUserIdList)); Result<List<IcResiUserDTO>> icUserInfoRes = epmetUserOpenFeignClient.getListIcResiUserDTO(new ArrayList<>(icUserIdList));
if (!icUserInfoRes.success() || CollectionUtils.isEmpty(icUserInfoRes.getData())) { 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)); 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: case UserDemandConstant.IC_USER_VOLUNTEER:
Map<String, IcResiUserDTO> icUserInfoMap = getIcVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId()))); Map<String, IcResiUserDTO> icUserInfoMap = getIcVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId())));
resDto.setServiceUnitName(StrConstant.EPMETY_STR); resDto.setServiceUnitName(StrConstant.EPMETY_STR);
resDto.setServiceUserName(icUserInfoMap.get(resDto.getServerId()).getName()); resDto.setServiceUserName(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getName() : StrConstant.EPMETY_STR);
resDto.setServiceUserMobile(icUserInfoMap.get(resDto.getServerId()).getMobile()); resDto.setServiceUserMobile(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getMobile() : StrConstant.EPMETY_STR);
break; break;
default: default:
log.warn("serviceType 错误"); log.warn("serviceType 错误");

Write Preview
Loading…
Cancel
Save