From 02e99e878911715d2785e371ae6fb576597578b0 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期五, 09 八月 2024 09:34:49 +0800
Subject: [PATCH] 8.9
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/RegionController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 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 ead6b5d..d3e7d91 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
@@ -40,6 +40,22 @@
@GetMapping("/addressTree")
@ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
public R<List<Region>> 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(null));
+ }
+
+ @GetMapping("/manageaddressTree")
+ @ApiOperation(value = "选择城市:省市二级联动", tags = {"后台-首页"})
+ public R<List<Region>> manageaddressTree() {
LoginUser loginUser = tokenService.getLoginUser();
if (null == loginUser) {
return R.loginExpire("登录失效！");
@@ -50,7 +66,9 @@
} else {
cityCodeList = new ArrayList<>();
}
- return R.ok(regionService.addressTree(cityCodeList));
+ return R.ok(regionService.addressTree1(cityCodeList));
}
+
+
}
--
Gitblit v1.7.1