Browse Source

档案调整界面的查询根据archiveId来查询

cr 1 tuần trước cách đây
mục cha
commit
a01d832dec

+ 4 - 4
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchiveFileController.java

@@ -157,7 +157,7 @@ public class ArchiveFileController extends BladeController {
     @ApiOperationSupport(order = 3)
     @ApiOperation(value = "分页")
     public R<Object> page(ArchiveFileVO queryVo) {
-        if (queryVo.getNodeIds().isEmpty() || queryVo.getNodeIds().equals("")) {
+        if (StringUtils.isEmpty(queryVo.getNodeIds())) {
 
         } else {
             ArchiveTreeContract rootNode = this.archiveTreeContractClient.getArchiveTreeContractById(Long.parseLong(queryVo.getNodeIds()));
@@ -171,10 +171,10 @@ public class ArchiveFileController extends BladeController {
 //                ids.add(queryVo.getNodeIds());
 //                queryVo.setNodeIdArray(ids);
 //            }
-            //优化
-            String authCode = this.archiveTreeContractClient.getAuthCode(queryVo.getContractId() == null ? null : Long.parseLong(queryVo.getContractId()));
-            queryVo.setAuthCode(authCode);
         }
+        //优化
+        String authCode = this.archiveTreeContractClient.getAuthCode(queryVo.getContractId() == null ? null : Long.parseLong(queryVo.getContractId()));
+        queryVo.setAuthCode(authCode);
         return R.data(this.archiveFileClient.selectArchiveFilePage(queryVo));
     }
 

+ 1 - 0
blade-service/blade-archive/src/main/java/org/springblade/archive/controller/ArchivesAutoController.java

@@ -707,6 +707,7 @@ public class ArchivesAutoController extends BladeController {
 			}
 			archiveFileClient.updateArchiveFile(updateArchiveFileList);
 			auto.setName(name);
+			auto.setFileN(archiveFileList.size());
 			//删除其他案卷
 			archivesAutoList.remove(auto);
 			archivesAutoService.deleteLogic(archivesAutoList.stream().map(o->o.getId()).collect(Collectors.toList()));