From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期一, 16 十二月 2024 13:34:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/RegionController.java | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 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 c01da9f..caeefba 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 @@ -17,28 +17,19 @@ @RestController @RequestMapping("/region") -@Api("地区") +@Api(tags = "地区") public class RegionController { @Resource private RegionService regionService; /** - * 获取省份列表 + * 省市区级联 */ @GetMapping("/getProvinceList") - @ApiOperation("获取省份列表") - public R<List<Region>> getProvinceList() { + @ApiOperation("省市区级联") + public R<List<Region>> getProvinceList(@ApiParam("父级id") @RequestParam Long parentId) { return R.ok(regionService.list(new LambdaQueryWrapper<Region>() - .eq(Region::getParentId, 0))); + .eq(Region::getParentId, parentId))); } - /** - * 获取下级地区列表 - */ - @GetMapping("/getNextRegionList") - @ApiOperation("获取下级地区列表") - public R<List<Region>> getNextRegionList(@ApiParam("父级id") @RequestParam Long id) { - return R.ok(regionService.list(new LambdaQueryWrapper<Region>() - .eq(Region::getParentId, id))); - } } -- Gitblit v1.7.1