Merge branch 'develop' of gitadmin/tuoheng_oidc into release

tuoheng_oidc_admin/src/main/resources/mapper/AuthoritiesMapper.xml

@@ -13,7 +13,7 @@
         delete
         from authorities
         where user_id = #{userId}
-          and client_id = #{clientId}
+          and authority = #{clientId}
     </delete>
     <select id="selectByUserId" resultType="com.tuoheng.model.po.AuthoritiesPo">
         SELECT id, user_id, username, authority

tuoheng_oidc_admin/target/classes/mapper/AuthoritiesMapper.xml

@@ -9,6 +9,12 @@
             (#{it.userId}, #{it.username}, #{it.authority}, #{it.createUser})
         </foreach>
     </insert>
+    <delete id="deleteByUserIdAndClient">
+        delete
+        from authorities
+        where user_id = #{userId}
+          and client_id = #{clientId}
+    </delete>
     <select id="selectByUserId" resultType="com.tuoheng.model.po.AuthoritiesPo">
         SELECT id, user_id, username, authority
         FROM authorities

tuoheng_oidc_admin/target/classes/mapper/ClientUserRoleMapper.xml

@@ -27,6 +27,12 @@
         </set>
         where user_id = #{userId} and client_id = #{clientId}
     </update>
+    <delete id="deleteByUserIdAndClient">
+        delete
+        from t_client_user_role
+        where user_id = #{userId}
+          and client_id = #{clientId}
+    </delete>
     <select id="selectListByUserId" resultType="com.tuoheng.model.po.ClientUserRolePo">
         SELECT *
         FROM t_client_user_role