From ec6d43aa07ee0e8faf34498057ebcfbb446aa015 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期二, 16 七月 2024 09:21:51 +0800
Subject: [PATCH] feat: 代码重构
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 1e17891..9e91884 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.admin.api.feignClient.AdminClient;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.StringUtils;
@@ -27,6 +28,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Set;
@@ -45,16 +47,13 @@
@Autowired
private ISysRoleService roleService;
-
-
@Autowired
private ISysPostService postService;
-
@Autowired
private ISysPermissionService permissionService;
- @Autowired
- private ISysConfigService configService;
+ @Resource
+ private AdminClient adminClient;
@GetMapping("/page")
@ApiImplicitParams({
@@ -134,6 +133,10 @@
sysUserVo.setRole(roles.getRoleName());
sysUserVo.setRoleId(roles.getRoleId());
sysUserVo.setPermissions(permissions);
+ if (null != sysUser.getFranchiseeId()) {
+ List<String> data = adminClient.cityDetail(sysUser.getFranchiseeId()).getData();
+ sysUserVo.setCityList(data);
+ }
return R.ok(sysUserVo);
}
--
Gitblit v1.7.1