[feat] 切换sys_user_account至ums_member_wechat

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

@@ -101,7 +101,7 @@ open class InnerSysUserController : BaseController() {
     fun infoByWxUnionId(@PathVariable("unionid") unionid: String): R<LoginUser> {
         val sysUser = kSysUserService.selectUserByWxUnionId(unionid)
         if (StringUtils.isNull(sysUser)) {
-            return R.fail("wx_unionid错误")
+            return R.fail("unionid错误")
         }
         // 角色集合
         val roles: Set<String> = permissionService.getRolePermission(sysUser)

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

@@ -28,8 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
 	<resultMap id="KSysUserAccount" type="KSysUserAccount">
-        <id     property="userId"    column="user_id"     />
+        <id     property="userId"    column="member_id"     />
-        <result property="wxUnionId"  column="wx_unionid"   />
+        <result property="wxUnionId"  column="unionid"   />
     </resultMap>
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
@@ -54,31 +54,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-        ua.wx_unionid
+        umw.unionid
         from sys_user u
-            left join sys_user_account ua on ua.user_id = u.user_id
+            left join ums_member_wechat umw on umw.member_id = u.user_id
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    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
     </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 umw.member_id, umw.unionid from ums_member_wechat umw where umw.member_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'
+		where umw.unionid = #{wxUnionId} and u.del_flag = '0'
 	</select>
 
     <select id="checkWxUnionIdUnique" parameterType="String" resultMap="SysUserResult">
-        select u.user_id, u.user_name from sys_user u left join sys_user_account ua on ua.user_id=u.user_id where ua.wx_unionid = #{wxUnionId} and u.del_flag = '0' limit 1
+        select u.user_id, u.user_name from sys_user u left join ums_member_wechat umw on umw.member_id=u.user_id where umw.unionid = #{wxUnionId} and u.del_flag = '0' limit 1
     </select>
 
     <insert id="insertSysUserAccount">
-        insert into sys_user_account(user_id, wx_unionid) values (#{userId},#{wxUnionId})
+        insert into ums_member_wechat(member_id, unionid) values (#{userId},#{wxUnionId})
     </insert>
     <insert id="updateSysUserAccount">
-        update sys_user_account set wx_unionid = #{wxUnionId} where user_id = #{userId}
+        update ums_member_wechat set unionid = #{wxUnionId} where member_id = #{userId}
     </insert>
 </mapper> 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -48,17 +48,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 	<resultMap id="sysUserAccountResult" type="KSysUserAccount">
-		<id     property="userId"    column="user_id"     />
+		<id     property="userId"    column="member_id"     />
-		<result property="wxUnionId"  column="wx_unionid"   />
+		<result property="wxUnionId"  column="unionid"   />
 	</resultMap>
 
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,
-		ua.wx_unionid
+		umw.unionid
         from sys_user u
-            left join sys_user_account ua on ua.user_id = u.user_id
+            left join ums_member_wechat umw on umw.member_id = u.user_id
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    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