兼容更新

src/main/java/com/macro/mall/tiny/modules/business/service/impl/BTowerServiceImpl.java

@@ -123,26 +123,31 @@ public class BTowerServiceImpl extends ServiceImpl<BTowerMapper, BTower> impleme
 
             // 检验是否包含塔形资料
             String shape = tower.getShape();
-            int lastIndex = shape.lastIndexOf('-');
-            if (lastIndex > 0) {
-                shape = shape.substring(0, lastIndex).replace('/', ' ');
-            }
             if (StringUtils.isNotBlank(shape)) {
-                secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), access);
-                thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, access);
-                if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
-                    tower.setHasFile(1);
-                    continue;
+                int lastIndex = shape.lastIndexOf('-');
+                if (lastIndex > 0) {
+                    shape = shape.substring(0, lastIndex).replace('/', ' ');
+                }
+                if (StringUtils.isNotBlank(shape)) {
+                    secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.TOWER_PIC.getName(), access);
+                    thirdBasePath = MyFileUtils.getAuthFilePath(secBasePath, shape, access);
+                    if (MyFileUtils.hasSonFile(thirdBasePath, access)) {
+                        tower.setHasFile(1);
+                        continue;
+                    }
                 }
             }
 
             // 检验是否含有金具串资料
-            secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), access);
-            String hardwareType = tower.getHardwareType().replace('/', ' ');
-            FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareType) || (name.startsWith(UploadConfig.AUTH_STR + hardwareType) && access);
-            if (MyFileUtils.hasSonFile(secBasePath, hardwareTypeFilter, access)) {
-                tower.setHasFile(1);
-                continue;
+            String hardwareType = tower.getHardwareType();
+            if (StringUtils.isNotBlank(hardwareType)) {
+                secBasePath = MyFileUtils.getAuthFilePath(basePath, DirectoryEnum.EARTH_WIRE_HARD_PIC.getName(), access);
+                String hardwareTypeReplace = hardwareType.replace('/', ' ');
+                FilenameFilter hardwareTypeFilter = (dir, name) -> name.startsWith(hardwareTypeReplace) || (name.startsWith(UploadConfig.AUTH_STR + hardwareTypeReplace) && access);
+                if (MyFileUtils.hasSonFile(secBasePath, hardwareTypeFilter, access)) {
+                    tower.setHasFile(1);
+                    continue;
+                }
             }
 
             // 检验是否含有巡检照片