From f6f2a586e7b1a8e474bffb4731cafe47147a9a6f Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 20 Jul 2022 15:48:31 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20=E5=A4=84=E7=90=86=E6=87=92=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kicc/system/controller/RegionController.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java index 51c5e12e..2857f5b8 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java @@ -6,6 +6,7 @@ import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.system.api.entity.Menu; import com.cloud.kicc.system.api.entity.Region; +import com.cloud.kicc.system.api.vo.ResultVo; import com.cloud.kicc.system.service.RegionService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; @@ -29,10 +30,9 @@ public class RegionController { private final RegionService regionService; - private LambdaQueryWrapper getQueryWrapper(Region region) { return new LambdaQueryWrapper() - .like(StrUtil.isNotBlank(region.getName()), Region::getName, region.getName()) + .eq(StrUtil.isNotBlank(region.getName()), Region::getName, region.getName()) .eq(StrUtil.isNotBlank(region.getCode()), Region::getCode, region.getCode()) .between(StrUtil.isNotBlank(region.getBeginTime()) && StrUtil.isNotBlank(region.getEndTime()), Region::getCreateTime, region.getBeginTime(), region.getEndTime()) .orderByAsc(Region::getSort); @@ -51,7 +51,14 @@ public class RegionController { @GetMapping("/{id:\\w+}") public R getById(@PathVariable("id") String id) { - return R.ok(regionService.getById(id)); + ResultVo resultVo = new ResultVo(); + Region region = regionService.getById(id); + resultVo.setResult(region); + if(!"0".equals(region.getParentId())) { + Region parentRegion = regionService.getById(region.getParentId()); + resultVo.setExtend(parentRegion); + } + return R.ok(resultVo); } @PostMapping("/save")