From 525c120c93c2c25d8dfc59d4fac234b80b37d1c0 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 09:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TStoreController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java b/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
index b8b01b7..64332c9 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
@@ -13,6 +13,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -51,10 +52,15 @@
}
return ApiResult.success(storeService.pageList(query));
}
- @ApiOperation(value = "省市区三级联动 获取省传0 市区传上级id")
+ @ApiOperation(value = "省市区三级联动 获取省不传值 市区县传上级code")
@GetMapping(value = "/list")
- public ApiResult<List<Region>> add(Integer parentId) {
- return ApiResult.success(regionService.lambdaQuery().eq(Region::getParentId,parentId).list());
+ public ApiResult<List<Region>> add(String code) {
+ if (!StringUtils.hasLength(code)){
+ return ApiResult.success(regionService.lambdaQuery().eq(Region::getParentId,0).list());
+ }else{
+ return ApiResult.success(regionService.lambdaQuery().eq(Region::getParentId,regionService.lambdaQuery().eq(Region::getCode,code).one().getId()).list());
+
+ }
}
/**
* 添加门店
--
Gitblit v1.7.1