Merge branch 'refs/heads/feature-lihb-20250909-privateSync' into feature-lihb-20250926-syncInfo

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeSynchronousRecordServiceImpl.java

@@ -55,6 +55,11 @@ public class WbsTreeSynchronousRecordServiceImpl extends ServiceImpl<WbsTreeSync
                 .in(WbsTreeSynchronousRecord::getStatus, 0, 1));
         List<String> nodeIds = wbsTreeSynchronousRecords.stream().map(WbsTreeSynchronousRecord::getNodeId).collect(Collectors.toList());
 
+        //  //判断节点类型  如果是试验或计量则不允许添加合同合同段
+        WbsTreePrivate wbsTreePrivate1 = wbsTreePrivateMapper.selectById(mWbsTreeSynchronousRecord.getNodeId());
+        if (mWbsTreeSynchronousRecord.getRange() == 2 && wbsTreePrivate1 != null && !Objects.equals(wbsTreePrivate1.getWbsType(), "1")) {
+            throw new ServiceException(wbsTreePrivate1.getNodeName() + " 节点不是质检类型，无法同步合同段");
+        }
         //所有子节点集合
         List<Long> privateIds = new ArrayList<>();
         //通过 ancestors_p_id 查询所有 非表单子节点
@@ -68,13 +73,6 @@ public class WbsTreeSynchronousRecordServiceImpl extends ServiceImpl<WbsTreeSync
                 );
                 privateIds.add(Long.valueOf(s));
                 privateIds.addAll(wbsTreePrivates.stream().map(WbsTreePrivate::getPKeyId).collect(Collectors.toList()));
-
-
-                //  //判断节点类型  如果是试验或计量则不允许添加合同合同段
-                WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectById(nodeId);
-                if (mWbsTreeSynchronousRecord.getRange() == 2 && wbsTreePrivate != null && !Objects.equals(wbsTreePrivate.getWbsType(), 1)) {
-                    throw new ServiceException(wbsTreePrivate.getNodeName() + " 节点不是质检类型，无法同步合同段");
-                }
             }
         }