diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 37a715a26..06105b4c9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -330,9 +330,11 @@ public class SysUserServiceImpl implements ISysUserService // 新增用户与岗位管理 insertUserPost(user); // 重绑定微信信息 - if (Objects.nonNull(user.getSysUserAccount()) && Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { + if (Objects.nonNull(user.getSysUserAccount())) { kSysUserService.unBindWxUnionIdByUserId(userId); - kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId()); + if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { + kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId()); + } } return userMapper.updateUser(user); } 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 2da4cca09..60005b906 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 @@ -136,6 +136,7 @@ open class InnerSysUserController : BaseController() { originUser.avatar = targetUser.avatar ?: originUser.avatar originUser.sex = targetUser.sex ?: originUser.sex originUser.updateBy = originUser.userName + originUser.sysUserAccount = loginUser.sysUser.sysUserAccount userService.updateUser(originUser) // 更新缓存用户信息 tokenService.setLoginUser(loginUser) diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt index dfcdef099..4636c3591 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt @@ -1,5 +1,6 @@ package com.ruoyi.system.mapper +import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser /** @@ -8,6 +9,13 @@ import com.ruoyi.system.api.domain.SysUser * @author hsdllcw */ interface KSysUserMapper { + /** + * 通过id查询用户 + * + * @param userId + * @return 用户对象信息 + */ + fun selectUserById(userId: Long): KSysUserAccount? /** * 通过用户名查询用户 * diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt index b8e0cd485..262bf29e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt @@ -1,10 +1,19 @@ package com.ruoyi.system.service +import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser interface IKSysUserService { fun getISysUserService(): ISysUserService + /** + * 通过id查询用户 + * + * @param userId + * @return 用户对象信息 + */ + fun selectUserById(userId: Long): KSysUserAccount? + /** * 通过微信unionid查询用户 * diff --git a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt index 3853e6a1d..6df0d2d6b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt +++ b/ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt @@ -20,6 +20,7 @@ open class KSysUserServiceImpl : IKSysUserService { @Autowired lateinit var kSysUserMapper: KSysUserMapper override fun getISysUserService() = sysUserService + override fun selectUserById(userId: Long) = kSysUserMapper.selectUserById(userId) override fun selectUserByWxUnionId(wxUnionId: String) = kSysUserMapper.selectUserByWxUnionId(wxUnionId) override fun checkWxUnionIdUnique(wxUnionId: String) = kSysUserMapper.checkWxUnionIdUnique(wxUnionId)?.run { UserConstants.NOT_UNIQUE } ?: UserConstants.UNIQUE @@ -49,7 +50,7 @@ open class KSysUserServiceImpl : IKSysUserService { } override fun bindWxUnionIdByUserId(userId: Long, wxUnionId: String): Int { - if (sysUserService.selectUserById(userId).sysUserAccount != null) + if (this.selectUserById(userId) != null) return kSysUserMapper.updateSysUserAccount( mapOf( "userId" to userId, diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml index b788e0304..6dca1e3e0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml @@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + @@ -61,6 +61,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_user_role ur on u.user_id = ur.user_id left join sys_role r on r.role_id = ur.role_id + +