[列装] 修改文件集合字段

dev-packing/src/main/java/com/tykj/dev/device/packing/controller/PackingController.java

@@ -280,10 +280,10 @@ public class PackingController {
         List<PackingLibrary> resultList;
         if (selectPack.getContent()==null&&selectPack.getModel()==null&&selectPack.getName()==null&&selectPack.getSecretLevel()==null&&selectPack.getStatus()==null){
             resultList = packingLibraryService.setOrder(packingLibraryService.getInsertList(selectPack));
-        }
-        else {
+        } else {
             resultList = packingLibraryService.getInsertList(selectPack);
         }
+
         Map<String,Object> map = new HashMap<>();
         //进行过滤 退装的目录下面 回收站
         List<Integer> statuses = new ArrayList<>(Arrays.asList(3, 4));
@@ -293,11 +293,11 @@ public class PackingController {
         resultList.removeAll(childs);
         childs.forEach(packingLibrary -> {
             List<PackingLibrary> in = packingLibraryDao.findAllByPartParentIdAndPackingStatusIn(packingLibrary.getId(), statuses);
-            packingLibrary.setFileList(FilesUtil.stringFileToList(packingLibrary.getFileDb()));
             if (in == null || in.size() == 0) {
                 resultList.add(packingLibrary);
             }
         });
+
         Page<PackingLibrary> packingLibraries = PageUtil.getPerPage(selectPack.getPage(), selectPack.getSize(), resultList, selectPack.getPageable());
 
         map.put("pages",packingLibraries);

dev-packing/src/main/java/com/tykj/dev/device/packing/subject/domin/PackingLibrary.java

@@ -2,6 +2,7 @@ package com.tykj.dev.device.packing.subject.domin;
 
 import com.tykj.dev.config.cache.ConfigCache;
 import com.tykj.dev.device.file.entity.FileRet;
+import com.tykj.dev.device.file.service.FilesUtil;
 import com.tykj.dev.misc.utils.SpringUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -293,6 +294,7 @@ public class PackingLibrary {
             setTypeName(configCache.getStyleMap().get(this.type)==null?"-":configCache.getStyleMap().get(this.type));
             setNatureName(configCache.getNatureMap().get(this.nature)==null?"-":configCache.getNatureMap().get(this.nature));
         }
+        setFileList(FilesUtil.stringFileToList(this.getFileDb()));
         return this;
     }
 }