FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 空数据时接口报错

Browse Source
This commit is contained in:
mzaxd
2023-11-27 18:30:57 +08:00
parent 098077e325
commit d0f3777d4a
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+12 -6
View File
@@ -208,7 +208,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
esRelations.add(standMenuRelation);
}
// 计算每个节点的数值
TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0);
if (!TsResources.isEmpty()) {
TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0);
}
// 拼接返回
return TsResources;
}
@@ -486,11 +488,15 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
.filter(resource1 -> resource1.getParentId().equals(resource.getId()))
.collect(Collectors.toList());
if (!tsResources.isEmpty()) {
tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList());
tsResources.forEach(resource1 -> {
resource1.setTreeType("sarMs");
resource1.setChildren(recursionGetListChildrenStand((resource1), (children)));
});
try {
tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList());
tsResources.forEach(resource1 -> {
resource1.setTreeType("sarMs");
resource1.setChildren(recursionGetListChildrenStand((resource1), (children)));
});
} catch (Exception e) {
log.error("异常");
}
}
return tsResources;
}