文件收集bug

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/ArchiveTreeContractClient.java

@@ -18,7 +18,7 @@ public interface ArchiveTreeContractClient {
     String API_PREFIX = "/api/manager/archiveContract";
 
     @PostMapping(API_PREFIX + "/queryAllChildByAncestors")
-    List<ArchiveTreeContract> queryAllChildByAncestors(@RequestParam String id,@RequestParam Long contractId);
+    List<ArchiveTreeContract> queryAllChildByAncestors(@RequestParam String id,@RequestParam(required = false) Long contractId);
 
 
     @PostMapping(API_PREFIX + "/getHavedFileNodeByProjectID")

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

@@ -113,15 +113,15 @@ public class ArchiveFileController extends BladeController {
     @ApiOperation(value = "分页")
     public R<Object> page( ArchiveFileVO queryVo){
         if(queryVo.getNodeIds().isEmpty() || queryVo.getNodeIds().equals("")){
-            return  R.data(null);
-        }
-        List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds(),queryVo.getContractId() == null?null:Long.parseLong(queryVo.getContractId()));
-        if(archiveTreeContracts != null && archiveTreeContracts.size() > 0){
-            List<String> ids = JSONArray.parseArray(JSONObject.toJSONString(archiveTreeContracts.stream().map(ArchiveTreeContract::getId).distinct().collect(Collectors.toList())), String.class);
-            ids.add(queryVo.getNodeIds());
-            queryVo.setNodeIdArray(ids);
-        }
 
+        }else {
+            List<ArchiveTreeContract> archiveTreeContracts = this.archiveTreeContractClient.queryAllChildByAncestors(queryVo.getNodeIds(), queryVo.getContractId() == null ? null : Long.parseLong(queryVo.getContractId()));
+            if (archiveTreeContracts != null && archiveTreeContracts.size() > 0) {
+                List<String> ids = JSONArray.parseArray(JSONObject.toJSONString(archiveTreeContracts.stream().map(ArchiveTreeContract::getId).distinct().collect(Collectors.toList())), String.class);
+                ids.add(queryVo.getNodeIds());
+                queryVo.setNodeIdArray(ids);
+            }
+        }
         return R.data(this.archiveFileClient.selectArchiveFilePage(queryVo));
     }
     /**

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

@@ -84,6 +84,9 @@
             <when test="vo.isArchive != null and vo.isArchive != ''">
                 and  is_auto_file = #{vo.isArchive}
             </when>
+            <when test="vo.archiveId != null and vo.archiveId != ''">
+                and 1=1
+            </when>
             <otherwise>
                 and (is_auto_file is null or is_auto_file != 1)
             </otherwise>
@@ -124,6 +127,9 @@
             <when test="vo.isArchive != null and vo.isArchive != ''">
                 and  is_auto_file = #{vo.isArchive}
             </when>
+            <when test="vo.archiveId != null and vo.archiveId != ''">
+                and 1=1
+            </when>
             <otherwise>
                 and (is_auto_file is null or is_auto_file != 1)
             </otherwise>
@@ -253,7 +259,7 @@
 
     <select id="selectBoxNameAndBoxNumber" resultType="java.util.Map">
         select box_name as boxName,box_number as boxNumber,group_concat(DISTINCT id ORDER BY id ASC SEPARATOR ',') as ids
-         from u_archive_file where node_id = #{nodeId} and box_number is not null
+         from u_archive_file where node_id = #{nodeId} and (box_number is not null or box_number != '')
          group by box_name order by box_number asc
     </select>
 

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/ArchiveFileServiceImpl.java

@@ -17,10 +17,7 @@ import org.springblade.system.feign.IDictBizClient;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  *  服务实现类
@@ -98,7 +95,21 @@ public class ArchiveFileServiceImpl extends BaseServiceImpl<ArchiveFileMapper, A
 
 	@Override
 	public void updateArchiveFileSort(List<ArchiveFileVO> list) {
-
+		List<Integer> listInt = new ArrayList<>();
+		for(int i=0;i<list.size();i++){
+			listInt.add(list.get(i).getSort());
+		}
+		//按照从大到小进行排序
+//		Collections.sort(listInt, new Comparator<Integer>() {
+//			@Override
+//			public int compare(Integer integer, Integer t1) {
+//				return integer-t1;
+//			}
+//		});
+		Collections.sort(listInt);
+		for(int i=0;i<list.size();i++){
+			list.get(i).setSort(listInt.get(i));
+		}
 		this.updateBatchById(JSONArray.parseArray(JSONObject.toJSONString(list), ArchiveFile.class));
 	}