Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ZTGK
hzsomms
Commits
09480292
Commit
09480292
authored
Jul 09, 2024
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:1.新需求提交-bug修改
parent
6497f030
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
WorkBatchMapper.xml
...cg/modules/maintenanceWork/mapper/xml/WorkBatchMapper.xml
+4
-2
No files found.
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchMapper.xml
View file @
09480292
...
@@ -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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment