[buffix] null point when getBalanceDataForDisplay

4a4f580e · neo · ead4192b · 4a4f580e
Commit 4a4f580e authored Jul 27, 2018 by neo
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

TBDataImportController.java ...a/pwc/taxtech/atms/controller/TBDataImportController.java +9 -7

No files found.
--- a/atms-api/src/main/java/pwc/taxtech/atms/controller/TBDataImportController.java
+++ b/atms-api/src/main/java/pwc/taxtech/atms/controller/TBDataImportController.java
@@ -245,13 +245,15 @@ public class TBDataImportController {
    private void initTree(List<JsonTrialBalanceTreeNode> nodes, String parentCode, List<JsonTrialBalanceTreeNode> sources) {
        JsonTrialBalanceTreeNode tempNode;
        //递归寻找子节点
-        List<JsonTrialBalanceTreeNode> tempTree = sources.stream().filter(item -> item.getParentCode().equals(parentCode)).collect(Collectors.toList());
+        if (sources != null && !sources.isEmpty()) {
-        for (JsonTrialBalanceTreeNode row : tempTree) {
+            List<JsonTrialBalanceTreeNode> tempTree = sources.stream().filter(item -> item.getParentCode().equals(parentCode)).collect(Collectors.toList());
-            tempNode = new JsonTrialBalanceTreeNode();
+            for (JsonTrialBalanceTreeNode row : tempTree) {
-            CommonUtils.copyProperties(row, tempNode);
+                tempNode = new JsonTrialBalanceTreeNode();
-            tempNode.setChildren(new ArrayList<>());
+                CommonUtils.copyProperties(row, tempNode);
-            nodes.add(tempNode);
+                tempNode.setChildren(new ArrayList<>());
-            initTree(tempNode.getChildren(), row.getAcctCode(), sources);
+                nodes.add(tempNode);
+                initTree(tempNode.getChildren(), row.getAcctCode(), sources);
+            }
        }
    }