From 1734f2d56162a1fdb556632dc36fcef0ca57851c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 16 十二月 2024 11:38:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/controller/TStoreController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 b72afe0..b8b01b7 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TStoreController.java
@@ -3,8 +3,10 @@
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.model.Region;
import com.jilongda.manage.model.TStore;
import com.jilongda.manage.query.TStoreQuery;
+import com.jilongda.manage.service.ITRegionService;
import com.jilongda.manage.service.TStoreService;
import com.jilongda.manage.utils.LoginInfoUtil;
import com.jilongda.manage.vo.TStoreVO;
@@ -34,6 +36,8 @@
private TStoreService storeService;
@Autowired
private LoginInfoUtil loginInfoUtil;
+ @Autowired
+ private ITRegionService regionService;
/**
* 获取门店列表
@@ -42,12 +46,16 @@
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TStoreVO>> pageList(@RequestBody TStoreQuery query) {
Integer userType = loginInfoUtil.getLoginUser().getUserType();
- if(Objects.equals(userType,2)){
+ if(!Objects.equals(userType,1)){
query.setStatus(1);
}
return ApiResult.success(storeService.pageList(query));
}
-
+ @ApiOperation(value = "省市区三级联动 获取省传0 市区传上级id")
+ @GetMapping(value = "/list")
+ public ApiResult<List<Region>> add(Integer parentId) {
+ return ApiResult.success(regionService.lambdaQuery().eq(Region::getParentId,parentId).list());
+ }
/**
* 添加门店
*/
--
Gitblit v1.7.1