全部

src/main/java/com/yj/earth/business/controller/MilitaryLibraryController.java

@@ -206,6 +206,9 @@ public class MilitaryLibraryController {
     @GetMapping("/militaryTypeTree")
     public ApiResponse militaryTypeTree(@Parameter(description = "军标名称") @RequestParam(value = "militaryName", required = false) String militaryName) throws SQLException, IllegalAccessException, InstantiationException {
         List<MilitaryTypeVo> treeList = militaryTypeList(militaryName);
+        if (treeList == null) {
+            return ApiResponse.successWithMessage("请先创建或导入军标库");
+        }
         return ApiResponse.success(treeList);
     }
 
@@ -430,7 +433,7 @@ public class MilitaryLibraryController {
         queryWrapper.eq(MilitaryLibrary::getIsEnable, 1); // 1=启用、0=未启用
         MilitaryLibrary library = militaryLibraryService.getOne(queryWrapper);
         if (library == null) {
-            throw new RuntimeException("请先创建或导入军标库");
+            return null;
         }
         return library.getPath();
     }