更新

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

@@ -11,6 +11,7 @@
         select count(1)
         from users
         where username = #{username}
+          and enabled = 1
     </select>
 
     <select id="getUserByUserName" parameterType="java.lang.String" resultType="com.tuoheng.model.po.UserPo">

tuoheng_oidc_admin/target/classes/mapper/ClientUserMapper.xml

@@ -36,12 +36,24 @@
 #           用户没有被删除
           and enabled = 1
     </select>
-    <select id="selectByTenantIdAndPage" resultType="com.tuoheng.model.po.UserPo">
-        SELECT *
-        FROM users
-        WHERE tenant_id = #{tenantId}
-#           用户没有被删除
-          and enabled = 1
+    <select id="selectByTenantIdAndPage" resultType="com.tuoheng.model.vo.UserVo">
+        SELECT
+        u.*,
+        a.authority platformCode
+        FROM
+        users u,
+        authorities a
+        WHERE
+        u.tenant_id = #{query.tenantId}
+        <if test="query.username != null and query.username != ''">
+            and u.username LIKE concat('%',#{query.username},'%')
+        </if>
+        <if test="query.platformCode != null and query.platformCode != ''">
+            and a.authority LIKE concat('%',#{query.platformCode},'%')
+        </if>
+        AND u.tenant_id = a.create_user
+        and u.enabled =1
+        GROUP BY u.username
     </select>
 
     <update id="updatePass" parameterType="com.tuoheng.model.po.UserPo">