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 { + 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