Commit 09480292 authored by hkl's avatar hkl

feat:1.新需求提交-bug修改

parent 6497f030
...@@ -173,8 +173,8 @@ ...@@ -173,8 +173,8 @@
t1.username, t1.username,
t1.realname, t1.realname,
t1.user_identity, t1.user_identity,
t3.role_name, GROUP_CONCAT(DISTINCT t3.role_name ORDER BY t3.role_name SEPARATOR ', ') AS role_name,
CONCAT(t1.username, ' | ', t1.realname, ' | ', t3.role_name) AS label CONCAT(t1.username, ' | ', t1.realname, ' | ', GROUP_CONCAT(DISTINCT t3.role_name ORDER BY t3.role_name SEPARATOR ', ')) AS label
FROM FROM
sys_user t1 sys_user t1
INNER JOIN sys_user_role t2 ON t2.user_id = t1.id INNER JOIN sys_user_role t2 ON t2.user_id = t1.id
...@@ -184,5 +184,7 @@ ...@@ -184,5 +184,7 @@
<if test="query != null and query != ''"> <if test="query != null and query != ''">
AND (t1.username LIKE concat('%',#{query},'%') OR t1.realname LIKE concat('%',#{query},'%')) AND (t1.username LIKE concat('%',#{query},'%') OR t1.realname LIKE concat('%',#{query},'%'))
</if> </if>
GROUP BY
t1.id, t1.username, t1.realname, t1.user_identity;
</select> </select>
</mapper> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment