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

[feat] 调整InnerSysUserController的继承关系

pull/445/head
hsdllcw 2024-10-26 11:07:25 +08:00
parent 6e02789274
commit df74143e71
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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