Merge remote-tracking branch 'origin/master'

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/arealevel/AreaLevelController.java

@@ -136,7 +136,13 @@ public class AreaLevelController {
         ExcelUtils.write(response, "行政区划.xls", "数据", AreaLevelRespVO.class,
                 BeanUtils.toBean(list, AreaLevelRespVO.class));
     }
-
+    @GetMapping("/all")
+    @Operation(summary = "获得行政区划所有")
+    @Parameter(name = "id", description = "编号")
+    public CommonResult<List<AreaLevelDO>> getAreaLevelList() {
+        List<AreaLevelDO> areaLevelAll = areaLevelService.getAll();
+        return success(areaLevelAll);
+    }
     @GetMapping("/getLoginUserXzqhConcise")
     @Operation(summary = "获得当前登录人行政区划简洁版")
     @Parameter(name = "id", description = "编号")

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/arealevel/AreaLevelService.java

@@ -69,4 +69,5 @@ public interface AreaLevelService {
 
     List<AreaLevelDO> getAreaLevelListAll(AdminUserDO user);
     List<AreaLevelDO> getLoginUserXzqhConcise(String areaCode);
+    List<AreaLevelDO> getAll();
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/arealevel/AreaLevelServiceImpl.java

@@ -152,7 +152,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
                     break;
                 }
             }
-        }else {
+        } else {
             resp = areaLevelMapper.selectById(id);
         }
         return resp;
@@ -165,7 +165,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
         List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
         if (allAreaLevels != null) {
             respList = allAreaLevels.stream().filter(areaLevelDO -> areaLevelDO.getAreaLevel() == 1).collect(Collectors.toList());
-        }else {
+        } else {
             respList = areaLevelMapper.selectShengLevel();
         }
         return respList;
@@ -179,7 +179,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
         List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
         if (allAreaLevels != null) {
             respList = allAreaLevels.stream().filter(areaLevelDO -> parentCode.equals(areaLevelDO.getParentCode())).collect(Collectors.toList());
-        }else {
+        } else {
             respList = areaLevelMapper.selectListByParentCode(parentCode);
         }
         return respList;
@@ -263,7 +263,7 @@ public class AreaLevelServiceImpl implements AreaLevelService {
         List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
         if (allAreaLevels != null) {
             respList = allAreaLevels.stream().filter(areaLevelDO -> areaCode.equals(areaLevelDO.getParentCode())).collect(Collectors.toList());
-        }else {
+        } else {
             respList = areaLevelMapper.selectListByParentCode(areaCode);
         }
 
@@ -271,6 +271,12 @@ public class AreaLevelServiceImpl implements AreaLevelService {
     }
 
     @Override
+    public List<AreaLevelDO> getAll() {
+        return areaLevelMapper.selectList();
+//        return null;
+    }
+
+    @Override
     public PageResult<AreaLevelDO> getAreaLevelPage(AreaLevelPageReqVO pageReqVO) {
         return areaLevelMapper.selectPage(pageReqVO);
     }