客户端新增节点

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -2592,6 +2592,7 @@ public class InformationWriteQueryController extends BladeController {
 
                 List<WbsTreeContract> childList = new ArrayList<>();
                 if (submitNodeList.size() > 0) {
+                    //只取原始表
                     this.foreachQueryChild(submitNodeList, childList);
                     //将表格数据设置
                     selectedNodeList.addAll(childList);
@@ -2628,6 +2629,7 @@ public class InformationWriteQueryController extends BladeController {
 
                 List<WbsTreeContract> childList = new ArrayList<>();
                 if (submitNodeList.size() > 0) {
+                    //只取原始表
                     this.foreachQueryChild(submitNodeList, childList);
                     //将表格数据设置
                     selectedNodeList.addAll(childList);
@@ -2836,13 +2838,15 @@ public class InformationWriteQueryController extends BladeController {
      */
     private void foreachQueryChild(List<WbsTreeContract> parentList, List<WbsTreeContract> childList) {
         parentList.forEach(parent -> {
-            List<WbsTreeContract> childs = this.wbsTreeContractClient.queryChildByParentId(parent, "", "");
+            //List<WbsTreeContract> childS = this.wbsTreeContractClient.queryChildByParentId(parent, "", "");
 
-            if (childs != null && childs.size() > 0) {
+            //只获取原始表，不获取复制的表（业务说是从项目wbs处取表，目前直接从当前合同段取原始表，也是一样的）
+            List<WbsTreeContract> childS = jdbcTemplate.query("select * from m_wbs_tree_contract where old_id is null and is_deleted = 0 and parent_id = " + parent.getId() + " and contract_id = " + parent.getContractId(), new BeanPropertyRowMapper<>(WbsTreeContract.class));
+            if (childS.size() > 0) {
                 //添加入结果集
-                childList.addAll(childs);
+                childList.addAll(childS);
                 //继续向下检查子集
-                this.foreachQueryChild(childs, childList);
+                this.foreachQueryChild(childS, childList);
             }
         });
     }