From 064457406bda554e713aea8bada1bb066be42b8e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 23 九月 2023 12:39:29 +0800
Subject: [PATCH] 9-23 去鵷雏管理端验证

---
 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 748e1ca..6b79d8e 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`, 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
@@ -41,5 +43,6 @@
         select id, name
         from lims_laboratory.user
         where job_state!=0
+        and type=1
     </select>
 </mapper>

--
Gitblit v1.9.3