非空判断

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -605,7 +605,7 @@ public class WxEnterpriseController extends WebBaseController {
         String wxEnterpriseId = loginUser.getWxEnterpriseId();
         List<EnterpriseDetailDTO> detailDTOS = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(wxEnterpriseId);
         List<String> enterpriseIds = detailDTOS.stream().filter(dto -> dto.getWxEnterpriseType() == 0).map(dto -> dto.getEnterpriseId()).collect(Collectors.toList());
-
+        
         List<EnterpriseDetailDTO> retList = wxEnterpriseRelatedApiService.listEnterpriseByEnterpriseIds(enterpriseIds);
         Map<String, EnterpriseDetailDTO> detailDTOMap = retList.stream().filter(dto -> dto.getWxEnterpriseType() == 1).collect(Collectors.toMap(dto -> dto.getWxEnterpriseId(), dto -> dto, (ne, ol) -> ol));
         Collection<EnterpriseDetailDTO> values = detailDTOMap.values();
@@ -617,10 +617,12 @@ public class WxEnterpriseController extends WebBaseController {
             if (CollectionUtils.isNotEmpty(materialDTOS)) {
                 wxEids = materialDTOS.stream().map(dto -> dto.getWxEnterpriseId()).collect(Collectors.toList());
             }
-
             List<String> finalWxEids = wxEids;
-            enterpriseList.forEach(dto -> {
+            for(AgentEnterpriseDTO dto : enterpriseList) {
                 WxEnterpriseDTO wxEnterpriseDTO = wxEnterpriseApiService.getOne(dto.getWxEnterpriseId());
+                if(null == wxEnterpriseDTO) {
+                   continue ;
+                }
                 logger.info("wxEnterpriseDTO={},dto={}", JSON.toJSONString(wxEnterpriseDTO),JSON.toJSONString(dto));
                 dto.setEnterpriseName(wxEnterpriseDTO.getCorpName());
                 if (finalWxEids.contains(dto.getWxEnterpriseId())) {
@@ -628,7 +630,7 @@ public class WxEnterpriseController extends WebBaseController {
                 } else {
                     dto.setBindFlag(0);
                 }
-            });
+            }
         }
         return resultResponse(HaoBanErrCode.ERR_1, enterpriseList);
     }