更新用户信息查询返回相关参数

tuoheng_oidc_server/src/main/java/com/tuoheng/model/dto/AuthoritiesDto.java

@@ -0,0 +1,17 @@
+package com.tuoheng.model.dto;
+
+import lombok.Data;
+
+/**
+ * @Author xiaoying
+ * @Date 2023/7/3 9:49
+ */
+@Data
+public class AuthoritiesDto {
+
+    private String authority;
+
+    private Integer status;
+
+
+}

tuoheng_oidc_server/src/main/java/com/tuoheng/model/dto/ClientRoleDto.java

@@ -14,4 +14,6 @@ public class ClientRoleDto {
 
     private Integer roleId;
 
+    private Integer status;
+
 }

tuoheng_oidc_server/src/main/java/com/tuoheng/model/dto/UserBaseInfoDto.java

@@ -21,7 +21,7 @@ public class UserBaseInfoDto {
     /**
      * 可以访问的 client
      */
-    private List<String> authorityList;
+    private List<AuthoritiesDto> authorityList;
 
     /**
      * 可以访问的 client 以及 role

tuoheng_oidc_server/src/main/resources/mapper/UserMapper.xml

@@ -3,15 +3,17 @@
 <mapper namespace="com.tuoheng.mapper.UserMapper">
 
     <resultMap type="com.tuoheng.model.dto.UserBaseInfoDto" id="UserBaseInfoMap">
-        <id column="userId" jdbcType="INTEGER" property="userId" />
-        <result column="userName" jdbcType="VARCHAR" property="userName" />
-        <result column="password" jdbcType="VARCHAR" property="password" />
-        <collection property="authorityList" ofType="java.lang.String" javaType="java.util.List">
-            <result column="authority" jdbcType="VARCHAR"/>
+        <id column="userId" jdbcType="INTEGER" property="userId"/>
+        <result column="userName" jdbcType="VARCHAR" property="userName"/>
+        <result column="password" jdbcType="VARCHAR" property="password"/>
+        <collection property="authorityList" ofType="com.tuoheng.model.dto.AuthoritiesDto" javaType="java.util.List">
+            <result column="authority" jdbcType="VARCHAR" property="authority"/>
+            <result column="status" jdbcType="INTEGER" property="status"/>
         </collection>
         <collection property="clientRoleDtoList" ofType="com.tuoheng.model.dto.ClientRoleDto" javaType="java.util.List">
-            <result column="clientId" jdbcType="VARCHAR" property="clientId" />
-            <result column="roleId" jdbcType="INTEGER" property="roleId" />
+            <result column="clientId" jdbcType="VARCHAR" property="clientId"/>
+            <result column="roleId" jdbcType="INTEGER" property="roleId"/>
+            <result column="status" jdbcType="INTEGER" property="status"/>
         </collection>
     </resultMap>
 
@@ -21,7 +23,12 @@
     </insert>
 
     <select id="getUserBaseInfo" resultMap="UserBaseInfoMap">
-        select a.id as userId, a.username as userName, a.password , b.authority, c.client_id as clientId, c.role_id as roleId
+        select a.id        as userId,
+               a.username  as userName,
+               a.password,
+               b.authority,
+               c.client_id as clientId,
+               c.role_id   as roleId
         from users a
                  left join authorities b on a.id = b.user_id
                  left join t_client_user_role c on a.id = c.user_id
@@ -29,7 +36,14 @@
     </select>
 
     <select id="getMpUserInfo" resultMap="UserBaseInfoMap">
-        select a.id as userId, a.username as userName, a.password , b.authority, c.client_id as clientId, c.role_id as roleId
+        select a.id        as userId,
+               a.username  as userName,
+               a.password,
+               b.authority,
+               b.status,
+               c.client_id as clientId,
+               c.role_id   as roleId,
+               c.status    as status
         from users a
                  left join authorities b on a.id = b.user_id
                  left join t_client_user_role c on a.id = c.user_id