From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
index 5cd3c8f..ead6b5d 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java
@@ -4,6 +4,8 @@
import com.ruoyi.admin.entity.Region;
import com.ruoyi.admin.service.RegionService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
@@ -11,6 +13,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -28,14 +31,26 @@
@Resource
private RegionService regionService;
+ @Resource
+ private TokenService tokenService;
/**
* 收货地址省市二级联动
*/
@GetMapping("/addressTree")
- @ApiOperation(value = "收货地址省市二级联动", tags = {"后台-首页"})
+ @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
public R<List<Region>> addressTree() {
- return R.ok(regionService.addressTree());
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
+ List<String> cityCodeList;
+ if (loginUser.getIsFranchisee()) {
+ cityCodeList = loginUser.getCityList();
+ } else {
+ cityCodeList = new ArrayList<>();
+ }
+ return R.ok(regionService.addressTree(cityCodeList));
}
}
--
Gitblit v1.7.1