From df74143e716d64868394bf88a5c467f34f518d70 Mon Sep 17 00:00:00 2001
From: hsdllcw <hsdllcw@qq.com>
Date: Sat, 26 Oct 2024 11:07:25 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E8=B0=83=E6=95=B4InnerSysUserControll?=
 =?UTF-8?q?er=E7=9A=84=E7=BB=A7=E6=89=BF=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/inner/InnerSysUserController.kt     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 a3117385a..ebeeac50c 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
@@ -2,6 +2,8 @@ package com.ruoyi.system.controller.inner
 
 import com.ruoyi.common.core.domain.R
 import com.ruoyi.common.core.utils.StringUtils
+import com.ruoyi.common.core.web.controller.BaseController
+import com.ruoyi.common.core.web.domain.AjaxResult
 import com.ruoyi.common.log.annotation.Log
 import com.ruoyi.common.log.enums.BusinessType
 import com.ruoyi.common.security.annotation.InnerAuth
@@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.*
  */
 @RestController
 @RequestMapping("/inner/user")
-open class InnerSysUserController {
+open class InnerSysUserController : BaseController() {
 
     @Autowired
     lateinit var userService: ISysUserService
@@ -82,7 +84,7 @@ open class InnerSysUserController {
     @InnerAuth
     @PutMapping
     @Log(title = "用户修改本人信息", businessType = BusinessType.UPDATE)
-    fun edit(@Validated @RequestBody loginUser: LoginUser): R<LoginUser> {
+    fun edit(@Validated @RequestBody loginUser: LoginUser): AjaxResult {
         val originUser = userService.selectUserById(loginUser.userid)
         val targetUser = loginUser.sysUser
         userService.checkUserAllowed(originUser)
@@ -103,6 +105,6 @@ open class InnerSysUserController {
         originUser.avatar = targetUser.avatar ?: originUser.avatar
         originUser.updateBy = originUser.userName
         userService.updateUser(originUser)
-        return R.ok(loginUser)
+        return success(loginUser)
     }
 }
\ No newline at end of file