From fd3c114f6dea28fe92b82bf35a6a33e3bb9a8485 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期二, 14 一月 2025 10:02:05 +0800 Subject: [PATCH] 修改bug --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java index 05c2cc2..0e0a518 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java @@ -10,7 +10,9 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; @RestController @RequestMapping("/region") @@ -23,11 +25,32 @@ * 省市区级联 */ @GetMapping("/getProvinceList") - @ApiOperation("省市区级联") + @ApiOperation(value = "省市区级联", tags = "管理后台") public R<List<Region>> getProvinceList(@ApiParam("父级id") @RequestParam Long parentId) { return R.ok(regionService.list(new LambdaQueryWrapper<Region>() .eq(Region::getParentId, parentId))); } + + + /** + * 省市区级联 + */ + @GetMapping("/getProvinceList1") + @ApiOperation(value = "省市区级联",tags = {"小程序"}) + public R<List<Region>> getProvinceList1() { + List<Region> list = regionService.list(); + List<Region> collect = list.stream().filter(s -> s.getParentId() == 0).collect(Collectors.toList()); + for (Region region : collect) { + List<Region> collect1 = list.stream().filter(s -> s.getParentId() == region.getId()).collect(Collectors.toList()); + for (Region region1 : collect1) { + List<Region> collect2 = list.stream().filter(s -> s.getParentId() == region1.getId()).collect(Collectors.toList()); + region1.setChilds(collect2); + } + region.setChilds(collect1); + } + return R.ok(collect); + } + /** -- Gitblit v1.7.1