Merge branch 'lk20230606'

blade-service/blade-archive/src/main/java/org/springblade/archive/service/impl/ArchivesAutoServiceImpl.java

@@ -1451,15 +1451,17 @@ public class ArchivesAutoServiceImpl extends BaseServiceImpl<ArchivesAutoMapper,
 
 		//分组，分程 建设单位，各个合同段，电子单位等
 		for (List<ArchiveTreeContract> subList: subGroupedList) {
+
+			//根据 authFilter函数过滤
+			subList = authFilter(subList,contractId,nodeId);
 			List<Long> ids = subList.stream()
 					.map(ArchiveTreeContract::getId)
 					.collect(Collectors.toList());
 
-			//todo 后续根据 authFilter函数过滤
-
-			subList = authFilter(subList,contractId,nodeId);
-
 			index =1;
+			if(ids.size()==0){
+				continue;
+			}
 			List<ArchivesAuto> archivesAutos = findArchivesAutosByIds(ids);
 			if (archivesAutos == null || archivesAutos.size() == 0) {
 				continue;

blade-service/blade-business/src/main/java/org/springblade/business/mapper/ArchiveFileMapper.xml

@@ -357,6 +357,7 @@
         from u_archive_file
         where node_id = #{nodeId}
           and (is_archive = 0 OR is_archive IS NULL)
+          and (is_auto_file is null or is_auto_file != 1)
           and is_deleted = 0
         order by sort
     </select>