From d0ffc2d4b452f913a75165aae759094ceb9150bc Mon Sep 17 00:00:00 2001
From: hsdllcw <hsdllcw@qq.com>
Date: Tue, 3 Dec 2024 20:08:52 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=85=AC=E4=BC=97?=
 =?UTF-8?q?=E5=8F=B7-H5=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E5=92=8C=E6=98=B5=E7=A7=B0=E6=B2=A1=E6=9C=89=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/system/controller/inner/InnerSysUserController.kt  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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