Merge branch 'lihb' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

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

@@ -311,7 +311,10 @@ public class WbsSynchronousServiceImpl {
                 List<WbsTreePrivate> editPrivateNodes = new ArrayList<>();
                 for (WbsTreePrivate templateNode : templateNodes) {
                     //数据修复-----------------------------------------------------------------------------------------------------------------------------------开始
-                    if (!isPublic && templateNode.getType() == 2 && collect.contains(2)) {
+                    if (!isPublic && templateNode.getType() == 2 && collect.contains(2) ) {
+                        if(CollectionUtil.isNotEmpty(formList) && !formList.contains(templateNode.getPKeyId())){
+                            continue;
+                        }
                         boolean isUpdate = false;
                         if (templateNode.getExcelId() != null) {
                             ExcelTab excelTab = excelTabMapper.selectOne(Wrappers.<ExcelTab>lambdaQuery()

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

@@ -210,7 +210,7 @@ public class WbsTreeSynchronousRecordServiceImpl extends ServiceImpl<WbsTreeSync
             wbsTreeSynchronousRecordVo.setId(projectInfo2.getId());
             wbsTreeSynchronousRecordVo.setName(projectInfo2.getProjectName());
             wbsTreeSynchronousRecordVo.setType(2);
-            wbsTreeSynchronousRecordVo.setWbsId(wbsTreePrivate.getWbsId());
+            wbsTreeSynchronousRecordVo.setWbsId(treePrivate.getWbsId());
             returnData.add(wbsTreeSynchronousRecordVo);
         }
         //公共项目