修改同步BUG

blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveInspectionInfoController.java

@@ -42,9 +42,10 @@ public class ArchiveInspectionInfoController {
             if (archivesAuto!= null ) {
                 archiveInspection.setArchiveName(archivesAuto.getName());
                 archiveInspection.setProjectId(archivesAuto.getProjectId());
-                archiveInspection.setTenantId(AuthUtil.getTenantId());
             }
         }
+        archiveInspection.setTenantId(AuthUtil.getTenantId());
+        archiveInspection.setUserId(AuthUtil.getUserId());
 
         boolean success = archiveInspectionService.save(archiveInspection);
         return success ? R.success("新增成功") : R.fail("新增失败");
@@ -62,6 +63,11 @@ public class ArchiveInspectionInfoController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "修改档案检查", notes = "传入archiveInspection")
     public R submit(@RequestBody ArchiveInspection archiveInspection) {
+
+        if (archiveInspection.getId() == null) {
+            return this.addArchiveInspection(archiveInspection);
+        }
+
         ArchiveInspection archiveInspectionMod = archiveInspectionService.getById(archiveInspection.getId());
         if (archiveInspectionMod!= null ) {
             archiveInspectionMod.setOpinion(archiveInspection.getOpinion());

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

@@ -11,10 +11,7 @@ import org.springblade.manager.vo.ArchiveTreeContractVO2;
 import org.springblade.manager.vo.ArchiveTreeVO2;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @AllArgsConstructor
@@ -46,9 +43,28 @@ public class ArchiveTreeContractSyncImpl {
         ForestNodeMergerEx.syncTreeList(srcTree, dstTree, addDst);
 
 
+        List<ArchiveTreeContractVO2> archiveTreeContractVO2s = new ArrayList<>();
+        //取出指定范围
+
+        ForestNodeMergerEx.getTreeList(dstTree, archiveTreeContractVO2s);
+        Map<Long,Long> map = new HashMap<>();
+        for (ArchiveTreeContractVO2 contractVO2 :archiveTreeContractVO2s) {
+            map.put(contractVO2.getId(),contractVO2.getContractId());
+        }
+        Long contractId = null;
+        for (ArchiveTreeContractVO2 addD : addDst) {
+            if (addD.getParentId()!= null && map.get(addD.getParentId())!= null) {
+                contractId = map.get(addD.getParentId());
+                break;
+            }
+        }
+
+
         for (ArchiveTreeContractVO2 addD : addDst) {
             ArchiveTreeContract archiveTreeContract = new ArchiveTreeContract(addD);
             archiveTreeContract.setCreateUser(AuthUtil.getUserId());
+            archiveTreeContract.setContractId(contractId);
+            archiveTreeContract.setTreeCode(contractId+"");
             saveList.add(archiveTreeContract);
         }