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); esRelations.add(standMenuRelation);
} }
// 计算每个节点的数值 // 计算每个节点的数值
TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0); if (!TsResources.isEmpty()) {
TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0);
}
// 拼接返回 // 拼接返回
return TsResources; return TsResources;
} }
@@ -486,11 +488,15 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
.filter(resource1 -> resource1.getParentId().equals(resource.getId())) .filter(resource1 -> resource1.getParentId().equals(resource.getId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!tsResources.isEmpty()) { if (!tsResources.isEmpty()) {
tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList()); try {
tsResources.forEach(resource1 -> { tsResources = tsResources.stream().sorted(Comparator.comparing(resource1 -> resource1.getDisplaySeq())).collect(Collectors.toList());
resource1.setTreeType("sarMs"); tsResources.forEach(resource1 -> {
resource1.setChildren(recursionGetListChildrenStand((resource1), (children))); resource1.setTreeType("sarMs");
}); resource1.setChildren(recursionGetListChildrenStand((resource1), (children)));
});
} catch (Exception e) {
log.error("异常");
}
} }
return tsResources; return tsResources;
} }
adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
+10 -8
View File
@@ -147,14 +147,16 @@ public class SarMenuStandard extends BaseEntity {
this.fbStandCount = countMatches(fbStandMenu, this.id, fbStandIdList); this.fbStandCount = countMatches(fbStandMenu, this.id, fbStandIdList);
this.esStandCount = countMatches(esStandMenu, this.id, esStandIdList); this.esStandCount = countMatches(esStandMenu, this.id, esStandIdList);
for (SarMenuStandard child : children) { if (children != null && !children.isEmpty()) {
child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu, curLevel + 1); for (SarMenuStandard child : children) {
this.gbStandCount += child.gbStandCount; child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu, curLevel + 1);
this.gbStandIdList.addAll(child.gbStandIdList); this.gbStandCount += child.gbStandCount;
this.fbStandCount += child.fbStandCount; this.gbStandIdList.addAll(child.gbStandIdList);
this.fbStandIdList.addAll(child.fbStandIdList); this.fbStandCount += child.fbStandCount;
this.esStandCount += child.esStandCount; this.fbStandIdList.addAll(child.fbStandIdList);
this.esStandIdList.addAll(child.esStandIdList); this.esStandCount += child.esStandCount;
this.esStandIdList.addAll(child.esStandIdList);
}
} }
} }