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] 修复保存用户信息报错的问题

pull/445/head
hsdllcw 2024-10-26 11:28:16 +08:00
parent df74143e71
commit 3e436ddd43
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,16 +27,16 @@ import org.springframework.web.bind.annotation.*
open class InnerSysUserController : BaseController() { open class InnerSysUserController : BaseController() {
@Autowired @Autowired
lateinit var userService: ISysUserService open lateinit var userService: ISysUserService
@Autowired @Autowired
lateinit var permissionService: ISysPermissionService open lateinit var permissionService: ISysPermissionService
@Autowired @Autowired
lateinit var deptService: ISysDeptService open lateinit var deptService: ISysDeptService
@Autowired @Autowired
lateinit var roleService: ISysRoleService open lateinit var roleService: ISysRoleService
/** /**
@ -87,10 +87,6 @@ open class InnerSysUserController : BaseController() {
fun edit(@Validated @RequestBody loginUser: LoginUser): AjaxResult { 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.checkUserDataScope(originUser.userId)
deptService.checkDeptDataScope(originUser.deptId)
roleService.checkRoleDataScope(*originUser.roleIds)
if (!userService.checkUserNameUnique(targetUser)) { if (!userService.checkUserNameUnique(targetUser)) {
return error("修改用户'" + targetUser.userName + "'失败，登录账号已存在") return error("修改用户'" + targetUser.userName + "'失败，登录账号已存在")
} else if (StringUtils.isNotEmpty(targetUser.phonenumber) && !userService.checkPhoneUnique(targetUser)) { } else if (StringUtils.isNotEmpty(targetUser.phonenumber) && !userService.checkPhoneUnique(targetUser)) {