高家顺 преди 4 години
родител
ревизия
0e50eccb1f
променени са 1 файла, в които са добавени 6 реда и са изтрити 2 реда
  1. 6 2
      src/main/java/com/macro/mall/tiny/modules/business/service/impl/BTowerServiceImpl.java

+ 6 - 2
src/main/java/com/macro/mall/tiny/modules/business/service/impl/BTowerServiceImpl.java

@@ -90,8 +90,12 @@ public class BTowerServiceImpl extends ServiceImpl<BTowerMapper, BTower> impleme
         // 获取6地线金具串图
         secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), auth);
         String hardwareType = tower.getHardwareType().replace('/', ' ');
-        FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareType) || (name.startsWith(UploadConfig.AUTH_STR + hardwareType) && auth);
-        sonList = MyFileUtils.getSonFiles(secBasePath, hardwareTypeFilter, auth);
+        if (StringUtils.isNotBlank(hardwareType)) {
+            FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareType) || (name.startsWith(UploadConfig.AUTH_STR + hardwareType) && auth);
+            sonList = MyFileUtils.getSonFiles(secBasePath, hardwareTypeFilter, auth);
+        } else {
+            sonList = Lists.newArrayList();
+        }
         resultMap.put("hardwareFileList", sonList);
 
         // 获取7班组巡检照片