From c0bbd3356de42175a4bf956d37e85bf74c169d4b Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 31 八月 2023 12:49:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/resources/mapper/UserMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index b89ebd9..6b79d8e 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -21,7 +21,7 @@
<select id="getNewPersonnelPage" resultType="map">
SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
- u.`age`,
+ u.`age`, CONCAT(r.`id`, '') roleId,
u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
FROM `user` u
LEFT JOIN role r
--
Gitblit v1.9.3