Merge branch 'dev_neo' into 'dev'

Dev neo

See merge request root/atms!88

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());
-        for (JsonTrialBalanceTreeNode row : tempTree) {
-            tempNode = new JsonTrialBalanceTreeNode();
-            CommonUtils.copyProperties(row, tempNode);
-            tempNode.setChildren(new ArrayList<>());
-            nodes.add(tempNode);
-            initTree(tempNode.getChildren(), row.getAcctCode(), sources);
+        if (sources != null && !sources.isEmpty()) {
+            List<JsonTrialBalanceTreeNode> tempTree = sources.stream().filter(item -> item.getParentCode().equals(parentCode)).collect(Collectors.toList());
+            for (JsonTrialBalanceTreeNode row : tempTree) {
+                tempNode = new JsonTrialBalanceTreeNode();
+                CommonUtils.copyProperties(row, tempNode);
+                tempNode.setChildren(new ArrayList<>());
+                nodes.add(tempNode);
+                initTree(tempNode.getChildren(), row.getAcctCode(), sources);
+            }
         }
     }