From e0e20362cadcd739be75960949b422b96e6481d7 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 29 八月 2023 17:51:46 +0800
Subject: [PATCH] 修改委托
---
user-server/src/main/resources/mapper/UserMapper.xml | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 98d4d25..b89ebd9 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -15,22 +15,14 @@
`user` u
WHERE e.`id` = u.`enterprise_id`
AND u.id = #{userId}
+ and type = 1
</select>
- <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.pojo.vo.PagePersonnelVo">
- <result property="id" column="id"/>
- <result property="username" column="username"/>
- <result property="roleName" column="roleName"/>
- <result property="createTime" column="create_time"/>
- <result property="age" column="age"/>
- <result property="phone" column="phone"/>
- <result property="email" column="email"/>
- <result property="jobState" column="job_state"/>
- <result property="department" column="department"/>
- </resultMap>
- <select id="getNewPersonnelPage" resultMap="PagePersonnelVoMap">
- SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, u.`age`,
- u.`phone`, u.`email`, u.`job_state`, o.`department`
+
+ <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.`phone`, u.`email`, u.`job_state` jobState, o.`department`, u.`account`, o.`id` departmentId
FROM `user` u
LEFT JOIN role r
ON u.`role_id` = r.`id` AND r.`state` = 1
@@ -43,6 +35,7 @@
<if test="status != null">
AND u.`job_state` in (#{status})
</if>
+ and type=1
ORDER BY u.`create_time` DESC
</select>
@@ -50,5 +43,6 @@
select id, name
from lims_laboratory.user
where job_state!=0
+ and type=1
</select>
</mapper>
--
Gitblit v1.9.3