|
@@ -60,11 +60,13 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
|
|
|
List<AdmEquipment> equipmentList = new ArrayList<>();
|
|
|
for(AdmSystem vo:vos) {
|
|
|
vo.setCategoryName(codeNameMap.get(vo.getClassCode()));
|
|
|
- AdmSystemCategory admSystemCategory = new AdmSystemCategory();
|
|
|
- admSystemCategory.setCategoryName(codeNameMaps.get(vo.getClassCode()).getName());
|
|
|
- admSystemCategory.setCode(codeNameMaps.get(vo.getClassCode()).getCode());
|
|
|
- admSystemCategory.setProjectI(codeNameMaps.get(vo.getClassCode()).getProjectId());
|
|
|
- vo.setCategoryNames(admSystemCategory);
|
|
|
+ if(codeNameMaps.get(vo.getClassCode()) != null){
|
|
|
+ AdmSystemCategory admSystemCategory = new AdmSystemCategory();
|
|
|
+ admSystemCategory.setCategoryName(codeNameMaps.get(vo.getClassCode()).getName());
|
|
|
+ admSystemCategory.setCode(codeNameMaps.get(vo.getClassCode()).getCode());
|
|
|
+ admSystemCategory.setProjectI(codeNameMaps.get(vo.getClassCode()).getProjectId());
|
|
|
+ vo.setCategoryNames(admSystemCategory);
|
|
|
+ }
|
|
|
// 收集设备对象
|
|
|
if(CollUtil.isEmpty(vo.getEquipmentList())) {
|
|
|
continue;
|