From c32f9d5443e8aba1428e39d6c214914410b8b208 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 15:41:16 +0800
Subject: [PATCH] 修改角色，用户
---
user-server/src/main/resources/mapper/UserMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 039f57c..6a87908 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -15,11 +15,13 @@
`user` u
WHERE e.`id` = u.`enterprise_id`
AND u.id = #{userId}
+ and type = 1
</select>
<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`,
+ SELECT u.`id`, u.`name` username, r.`name` roleName, DATE_FORMAT(u.`create_time`, '%Y-%m-%d') createTime,
+ u.`age`,
u.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
FROM `user` u
LEFT JOIN role r
@@ -33,6 +35,7 @@
<if test="status != null">
AND u.`job_state` in (#{status})
</if>
+ and type=1
ORDER BY u.`create_time` DESC
</select>
--
Gitblit v1.9.3