|
|
@@ -1332,17 +1332,19 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
|
|
|
List<Formula> deepFormulaList = new ArrayList<>();
|
|
|
tempFormulas.forEach(item -> {
|
|
|
List<String> relyList = item.getRelyList();
|
|
|
- relyList.forEach(rely -> {
|
|
|
- KeyMapper keyMapper = keyMapperMap.get(rely);
|
|
|
- if (keyMapper != null) {
|
|
|
- Formula temp = formulaMap.get(keyMapper.getFormulaId());
|
|
|
- if (temp != null) {
|
|
|
- formulaList.add(temp);
|
|
|
- deepFormulaList.add(temp);
|
|
|
+ if (relyList != null) {
|
|
|
+ relyList.forEach(rely -> {
|
|
|
+ KeyMapper keyMapper = keyMapperMap.get(rely);
|
|
|
+ if (keyMapper != null) {
|
|
|
+ Formula temp = formulaMap.get(keyMapper.getFormulaId());
|
|
|
+ if (temp != null) {
|
|
|
+ formulaList.add(temp);
|
|
|
+ deepFormulaList.add(temp);
|
|
|
+ }
|
|
|
+ keyMapperList.add(keyMapper);
|
|
|
}
|
|
|
- keyMapperList.add(keyMapper);
|
|
|
- }
|
|
|
- });
|
|
|
+ });
|
|
|
+ }
|
|
|
});
|
|
|
if (deepFormulaList.isEmpty()) {
|
|
|
break;
|