From 4714f3e841933973d6bb9f19c89d5b9c74a67209 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 14:11:42 +0800
Subject: [PATCH] 提现代码

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java |   16 +++++++++++-----
 1 files changed, 11 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..0be4edc 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);
     }
 
@@ -191,6 +194,9 @@
         return toAjax(userService.insertUser(user));
     }
 
+    public static void main(String[] args) {
+        System.err.println(SecurityUtils.encryptPassword("a123456"));
+    }
     /**
      * 修改用户
      */

--
Gitblit v1.7.1