Browse Source

Merge branch 'online' into test

yonge 1 week ago
parent
commit
1c524aa471

+ 6 - 2
cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -32,6 +32,7 @@
         <result column="certificate_type_" property="certificateType"/>
         <result column="last_username_time_" property="lastUsernameTime"/>
         <result column="tenant_id_" property="tenantId"/>
+        <result column="invite_user_id_" property="inviteUserId"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -66,9 +67,9 @@
             keyProperty="id">
         INSERT INTO sys_user
         (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,
-        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,certificate_type_)
+        gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,certificate_type_,invite_user_id_)
         VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},now(),now(),#{wxOpenid},#{qqOpenid},#{userType},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{certificateType})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{certificateType},#{inviteUserId})
     </insert>
 
     <insert id="saveTeacher">
@@ -156,6 +157,9 @@
             <if test="lastUsernameTime != null">
                 last_username_time_ = #{lastUsernameTime},
             </if>
+            <if test="inviteUserId != null">
+                invite_user_id_ = #{inviteUserId},
+            </if>
         </set>
         WHERE del_flag_ = 0 and id_ = #{id}
     </update>