From 585d83d00705308382d97412f1cb49f93d9f8036 Mon Sep 17 00:00:00 2001 From: hsdllcw Date: Tue, 27 May 2025 15:12:23 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8Eunionid=E5=92=8Copenid=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysUserServiceImpl.java | 4 +-- .../inner/InnerSysUserController.kt | 2 +- .../com/ruoyi/system/mapper/KSysUserMapper.kt | 4 ++- .../ruoyi/system/service/IKSysUserService.kt | 2 +- .../service/impl/KSysUserServiceImpl.kt | 9 ++--- .../mapper/system/KSysUserMapper.xml | 33 +++++++++++-------- 6 files changed, 27 insertions(+), 27 deletions(-) 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 a85101f9a..4fb547586 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 @@ -331,10 +331,8 @@ public class SysUserServiceImpl implements ISysUserService insertUserPost(user); // 重绑定微信信息 if (Objects.nonNull(user.getSysUserAccount())) { - KSysUserAccount sysUserAccount = new KSysUserAccount(); - sysUserAccount.setUserId(userId); - kSysUserService.updateSysUserAccount(sysUserAccount); if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) { + kSysUserService.unBindWxByUserId(userId); kSysUserService.updateSysUserAccount(user.getSysUserAccount()); } } 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 d3be5411c..0aeedc9a9 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 @@ -140,7 +140,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 + originUser.sysUserAccount = loginUser.sysUser.sysUserAccount.apply { this.userId = originUser.userId } 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 fd57b87cb..2ddf46e67 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 @@ -2,6 +2,7 @@ package com.ruoyi.system.mapper import com.ruoyi.system.api.domain.KSysUserAccount import com.ruoyi.system.api.domain.SysUser +import org.apache.ibatis.annotations.Param /** * 用户表 数据层 @@ -16,6 +17,7 @@ interface KSysUserMapper { * @return 用户对象信息 */ fun selectUserById(userId: Long): KSysUserAccount? + /** * 通过用户名查询用户 * @@ -36,5 +38,5 @@ interface KSysUserMapper { fun updateSysUserAccount(sysUserAccount: KSysUserAccount): Int - fun unBindWxUnionIdByUserId(params: Map): Int + fun unBindWxByUserId(@Param("userId") userId: Long): Int } \ No newline at end of file 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 7c1c77b49..968b58603 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 @@ -44,5 +44,5 @@ interface IKSysUserService { /** * 解绑微信 */ - fun unBindWxUnionIdByUserId(userId: Long): Int + fun unBindWxByUserId(userId: Long): Int } \ No newline at end of file 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 481260936..6e00e32b6 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 @@ -50,12 +50,7 @@ open class KSysUserServiceImpl : IKSysUserService { return kSysUserMapper.updateSysUserAccount(sysUserAccount) } - override fun unBindWxUnionIdByUserId(userId: Long): Int { - return kSysUserMapper.unBindWxUnionIdByUserId( - mapOf( - "userId" to userId, - "wxUnionId" to null, - ) - ) + override fun unBindWxByUserId(userId: Long): Int { + return kSysUserMapper.unBindWxByUserId(userId) } } \ No newline at end of file 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 c6db0301b..50511d346 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 @@ -130,23 +130,28 @@ update ums_member_wechat - set unionid = #{wxUnionId}, - openid = #{openid}, - routine_openid = #{routineOpenid}, - groupid = #{groupid}, - tagid_list = #{tagidList}, - subscribe = #{subscribe}, - subscribe_time = #{subscribeTime}, - session_key = #{sessionKey}, - access_token = #{accessToken}, - expires_in = #{expiresIn}, - refresh_token = #{refreshToken}, - expire_time = #{expireTime} + + unionid = #{unionid}, + openid = #{openid}, + routine_openid = #{routineOpenid}, + groupid = #{groupid}, + tagid_list = #{tagidList}, + subscribe = #{subscribe}, + subscribe_time = #{subscribeTime}, + session_key = #{sessionKey}, + access_token = #{accessToken}, + expires_in = #{expiresIn}, + refresh_token = #{refreshToken}, + expire_time = #{expireTime}, + update_time = sysdate() + where member_id = #{userId} - + update ums_member_wechat - set unionid = #{wxUnionId} + set unionid = null, + openid = null, + routine_openid = null where member_id = #{userId} \ No newline at end of file