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,6 +245,7 @@ public class TBDataImportController {
     private void initTree(List<JsonTrialBalanceTreeNode> nodes, String parentCode, List<JsonTrialBalanceTreeNode> sources) {
         JsonTrialBalanceTreeNode tempNode;
         //递归寻找子节点
+        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();
@@ -254,6 +255,7 @@ public class TBDataImportController {
                 initTree(tempNode.getChildren(), row.getAcctCode(), sources);
             }
         }
+    }
 
     private static List<TrialBalanceDto> filterTrialBalanceList(TrialBalanceFilter filter, List<TrialBalanceDto> balanceList) {
         // Account Code: support multiple codes seperated by space: