no message

@@ -27,10 +27,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.rmi.ServerException;
 import java.rmi.ServerException;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 
 /**
 /**
  * 套件Service业务层处理
  * 套件Service业务层处理
@@ -69,17 +66,21 @@ public class EntiretyServiceImpl implements IEntiretyService {
         Set<String> buildingBlockIdList = StreamUtils.toSet(list,EntiretyVo::getId);
         Set<String> buildingBlockIdList = StreamUtils.toSet(list,EntiretyVo::getId);
         List<BuildingBlockVo> buildingBlockList = getBuildingBlockService().list(language, buildingBlockIdList);
         List<BuildingBlockVo> buildingBlockList = getBuildingBlockService().list(language, buildingBlockIdList);
         for(BuildingBlockVo vo : buildingBlockList){
         for(BuildingBlockVo vo : buildingBlockList){
-            if(StrUtil.isNotBlank(vo.getOssId())) {
+            if(Objects.nonNull(vo)) {
+                if (StrUtil.isNotBlank(vo.getOssId())) {
                     vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
                     vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
                 }
                 }
             }
             }
+        }
         Map<String,List<BuildingBlockVo>> buildingBlockMap = StreamUtils.groupByKey(buildingBlockList,BuildingBlockVo::getEntiretyId);
         Map<String,List<BuildingBlockVo>> buildingBlockMap = StreamUtils.groupByKey(buildingBlockList,BuildingBlockVo::getEntiretyId);
         for(EntiretyVo vo:list){
         for(EntiretyVo vo:list){
-            if(StrUtil.isNotBlank(vo.getOssId())) {
+            if(Objects.nonNull(vo)) {
+                if (StrUtil.isNotBlank(vo.getOssId())) {
                     vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
                     vo.setOssUrl(ossUrlService.selectUrlByIds(vo.getOssId()));
                 }
                 }
                 vo.setBuildingblockList(buildingBlockMap.get(vo.getId()));
                 vo.setBuildingblockList(buildingBlockMap.get(vo.getId()));
             }
             }
+        }
         return TableDataInfo.build(page);
         return TableDataInfo.build(page);
     }
     }