Skip to content

H
haoban-manage3.0
Commit 95789ee7 by 墨竹
Options

fix：空指针修改

parent 083accb9
Showing with 7 additions and 3 deletions
haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/GicDepartmentController.java
......@@ -50,9 +50,13 @@ public class GicDepartmentController extends WebBaseController{
if (CollectionUtils.isNotEmpty(rangeInfoDTOList)) {
List<WxEnterpriseDTO> wxEnterpriseDTOS = wxEnterpriseRelatedApiService.listWxEnterpriseByEid(enterpriseId);
if (CollectionUtils.isNotEmpty(wxEnterpriseDTOS)) {
Map<String, WxEnterpriseDTO> wxEnterpriseDTOMap = wxEnterpriseDTOS.stream().collect(Collectors.toMap(dto -> dto.getWxEnterpriseId(), dto -> dto));
storeRangeMap = rangeInfoDTOList.stream().filter(dto -> (!dto.getWxEnterpriseId().equals(wxEnterpriseId)) && dto.getRelationType() == 1)
.peek(dto -> dto.setWxEnterpriseName(wxEnterpriseDTOMap.get(dto.getWxEnterpriseId()).getCorpName())).collect(Collectors.toMap(dto -> dto.getRelationId(), dto -> dto));
Map<String, WxEnterpriseDTO> wxEnterpriseDTOMap = wxEnterpriseDTOS.stream().collect(Collectors.toMap(WxEnterpriseDTO::getWxEnterpriseId, dto -> dto));
storeRangeMap = rangeInfoDTOList.stream()
.filter(dto -> (!dto.getWxEnterpriseId().equals(wxEnterpriseId))
&& dto.getRelationType() == 1
&& wxEnterpriseDTOMap.get(dto.getWxEnterpriseId()) != null)
.peek(dto -> dto.setWxEnterpriseName(wxEnterpriseDTOMap.get(dto.getWxEnterpriseId()).getCorpName()))
.collect(Collectors.toMap(StoreRangeInfoDTO::getRelationId, dto -> dto));
}
}
Map<String, StoreRangeInfoDTO> finalStoreRangeMap = storeRangeMap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment