wsy182
/
RuoYi-Cloud
mirror of https://gitee.com/y_project/RuoYi-Cloud.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[fix] 修复公众号-H5微信登录头像和昵称没有保存的问题

pull/445/head
hsdllcw 2024-12-03 20:08:52 +08:00
parent 3186ab2168
commit d0ffc2d4b4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/controller/inner/InnerSysUserController.kt
View File

@ -3,6 +3,7 @@ package com.ruoyi.system.controller.inner
import com.github.pagehelper.Page import com.github.pagehelper.Page
import com.ruoyi.common.core.domain.R import com.ruoyi.common.core.domain.R
import com.ruoyi.common.core.utils.StringUtils import com.ruoyi.common.core.utils.StringUtils
import com.ruoyi.common.core.utils.ip.IpUtils
import com.ruoyi.common.core.web.controller.BaseController import com.ruoyi.common.core.web.controller.BaseController
import com.ruoyi.common.core.web.domain.AjaxResult import com.ruoyi.common.core.web.domain.AjaxResult
import com.ruoyi.common.log.annotation.Log import com.ruoyi.common.log.annotation.Log
@ -107,6 +108,8 @@ open class InnerSysUserController : BaseController() {
// 权限集合 // 权限集合
val permissions: Set<String> = permissionService.getMenuPermission(sysUser) val permissions: Set<String> = permissionService.getMenuPermission(sysUser)
val sysUserVo = LoginUser() val sysUserVo = LoginUser()
sysUserVo.userid = sysUser?.userId
sysUserVo.ipaddr = IpUtils.getIpAddr()
sysUserVo.sysUser = sysUser sysUserVo.sysUser = sysUser
sysUserVo.roles = roles sysUserVo.roles = roles
sysUserVo.permissions = permissions sysUserVo.permissions = permissions
@ -120,7 +123,6 @@ open class InnerSysUserController : BaseController() {
@PutMapping @PutMapping
@Log(title = "用户修改本人信息", businessType = BusinessType.UPDATE) @Log(title = "用户修改本人信息", businessType = BusinessType.UPDATE)
fun edit(@Validated @RequestBody loginUser: LoginUser): AjaxResult { fun edit(@Validated @RequestBody loginUser: LoginUser): AjaxResult {
val originUser = userService.selectUserById(loginUser.userid)
val targetUser = loginUser.sysUser val targetUser = loginUser.sysUser
if (!userService.checkUserNameUnique(targetUser)) { if (!userService.checkUserNameUnique(targetUser)) {
return error("修改用户'" + targetUser.userName + "'失败，登录账号已存在") return error("修改用户'" + targetUser.userName + "'失败，登录账号已存在")
@ -129,6 +131,7 @@ open class InnerSysUserController : BaseController() {
} else if (StringUtils.isNotEmpty(targetUser.email) && !userService.checkEmailUnique(targetUser)) { } else if (StringUtils.isNotEmpty(targetUser.email) && !userService.checkEmailUnique(targetUser)) {
return error("修改用户'" + targetUser.userName + "'失败，邮箱账号已存在") return error("修改用户'" + targetUser.userName + "'失败，邮箱账号已存在")
} }
val originUser = userService.selectUserById(targetUser.userId)
originUser.userName = targetUser.userName ?: originUser.userName originUser.userName = targetUser.userName ?: originUser.userName
originUser.nickName = targetUser.nickName ?: originUser.nickName originUser.nickName = targetUser.nickName ?: originUser.nickName
originUser.phonenumber = targetUser.phonenumber ?: originUser.phonenumber originUser.phonenumber = targetUser.phonenumber ?: originUser.phonenumber