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-11-30 17:27:45 +08:00
parent e0368a0392
commit 3abe897643
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@ -330,10 +330,12 @@ 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);
if (Objects.nonNull(user.getSysUserAccount().getWxUnionId())) {
kSysUserService.bindWxUnionIdByUserId(userId, user.getSysUserAccount().getWxUnionId());
}
}
return userMapper.updateUser(user);
}

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

@ -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)

8
ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/mapper/KSysUserMapper.kt
View File

@ -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?
/**
* 通过用户名查询用户
*

9
ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/IKSysUserService.kt
View File

@ -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查询用户
*

3
ruoyi-modules/ruoyi-system/src/main/kotlin/com/ruoyi/system/service/impl/KSysUserServiceImpl.kt
View File

@ -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,

8
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/KSysUserMapper.xml
View File

@ -23,11 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<association property="sysUserAccount" javaType="KSysUserAccount" resultMap="sysUserAccountResult" />
<association property="SysUserAccount" javaType="KSysUserAccount" resultMap="KSysUserAccount" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
<resultMap id="sysUserAccountResult" type="KSysUserAccount">
<resultMap id="KSysUserAccount" type="KSysUserAccount">
<id property="userId" column="user_id" />
<result property="wxUnionId" column="wx_unionid" />
</resultMap>
@ -62,6 +62,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_role r on r.role_id = ur.role_id
</sql>
<select id="selectUserById" parameterType="Long" resultMap="KSysUserAccount">
select ua.user_id, ua.wx_unionid from sys_user_account ua where ua.user_id = #{userId} limit 1
</select>
<select id="selectUserByWxUnionId" parameterType="String" resultMap="SysUserResult">
<include refid="selectUserVo"/>
where ua.wx_unionid = #{wxUnionId} and u.del_flag = '0'