From c0f3dff0f66553f9e9eedd1e4dd6149ce74ceb20 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:27:09 +0800
Subject: [PATCH] update 合并 satoken 解决不兼容不分
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
index 5e432ab..a435627 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
@@ -49,9 +49,9 @@
@ApiOperation("涓汉淇℃伅")
@GetMapping
public AjaxResult<Map<String, Object>> profile() {
- SysUser user = userService.getById(getUserId());
- Map<String, Object> ajax = new HashMap<>();
- ajax.put("user", user);
+ SysUser user = userService.selectUserById(getUserId());
+ Map<String, Object> ajax = new HashMap<>();
+ ajax.put("user", user);
ajax.put("roleGroup", userService.selectUserRoleGroup(user.getUserName()));
ajax.put("postGroup", userService.selectUserPostGroup(user.getUserName()));
return AjaxResult.success(ajax);
@@ -119,8 +119,8 @@
public AjaxResult<Map<String, Object>> avatar(@RequestPart("avatarfile") MultipartFile file) {
Map<String,Object> ajax = new HashMap<>();
if (!file.isEmpty()) {
- SysOss oss = iSysOssService.upload(file);
- String avatar = oss.getUrl();
+ SysOss oss = iSysOssService.upload(file);
+ String avatar = oss.getUrl();
if (userService.updateUserAvatar(getUsername(), avatar)) {
ajax.put("imgUrl", avatar);
return AjaxResult.success(ajax);
--
Gitblit v1.9.3