资料未上报重刷

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

@@ -3042,8 +3042,8 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
 
     //检查新增类型
     if ("1".equals(vo.getSaveType())) {
-        //todo 当前节点及其子节点
-        //当前节点及其子节点时，半选说明其下的子节点并不是全部选中的，所以这时候只需要根据全选的查询其全部子节点即可
+        //todo 当前及父节点
+        //当前及父节点时，半选说明其下的子节点并不是全部选中的，所以这时候只需要根据全选的查询其全部子节点即可
         if (allSelectedNodeList.size() > 0) {
             //查询数据
             selectedNodeList = this.unifiedCode(allSelectedNodeList, treeContract, "1", query);
@@ -3070,7 +3070,7 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
         //处理半选
         this.disposeHalfSelectList(treeContract, halfSelectedNodeList, selectedNodeList, query);
 
-    } else {
+    } else if("2".equals(vo.getSaveType())){
         //todo 仅当前节点操作
         if (allSelectedNodeList.size() > 0) {
             if (allSelectedNodeList.size() != 1) {
@@ -3097,8 +3097,11 @@ public R<Boolean> saveContractTreeNode(@RequestBody AddContractTreeNodeVO vo) {
                     ArrayList::new
             ));
         }
+    }else if("3".equals(vo.getSaveType())){
+        //todo 当前及子节点
     }
 
+
     //保存集合
     List<WbsTreeContract> saveList = new ArrayList<>();
     List<ConstructionLedger> saveLedger = new ArrayList<>();

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/NodeBaseInfoController.java

@@ -144,14 +144,7 @@ public class NodeBaseInfoController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "自动获取表单所有的参数库数据", notes = "pkeyId表单Id，nodeId节点Id")
 	public R getAllNodeBaseInfoByPkeyId(@RequestParam Long pkeyId,@RequestParam Long nodeId) throws Exception {
-		//nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId,nodeId)
-		HashMap map=new HashMap<>();
-		map.put("key_22__3_1",123);
-		map.put("key_37__3_3",123);
-		map.put("key_12__7_1",123);
-		map.put("key_6__11_1",123);
-		map.put("key_20__13_1",123);
-		return R.data(map);
+		return R.data(nodeBaseInfoService.getAllNodeBaseInfoByPkeyId(pkeyId,nodeId));
 	}