From 0042c9bee29a876a754e4d542bfba956822e7844 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 17 七月 2023 13:40:00 +0800
Subject: [PATCH] LIMS管理系统框架-开发7-17-v1.0.0
---
user-server/src/main/resources/mapper/UserMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 9f0e8b6..65aa6bb 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -3,10 +3,29 @@
<mapper namespace="com.yuanchu.limslaboratory.mapper.UserMapper">
<select id="selectUserByUserId" parameterType="int" resultType="Map">
- select u.account account,u.name uname,u.phone,u.email,u.info,e.byname,e.`name`,e.link_name,e.link_phone
- from enterprise_user_list el,enterprise e,`user` u
- where e.id = el.enterprise_id
- and el.user_id = u.id
- and u.id = #{userId}
+ SELECT u.account account,u.name uname,u.phone,u.email,u.info,e.byname e_byname,e.`name` e_name,e.link_name e_link_name,e.link_phone e_phone
+ FROM enterprise e,`user` u
+ WHERE e.`id` = u.`enterprise_id`
+ AND u.id = #{userId}
+ </select>
+
+ <resultMap id="PagePersonnelVoMap" type="com.yuanchu.limslaboratory.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"/>
+ </resultMap>
+ <select id="getNewPersonnelPage" resultMap="PagePersonnelVoMap">
+ SELECT u.`id`, u.`name` username, r.`name` roleName, u.`create_time`, IFNULL(u.`age`, '---') age,
+ IFNULL(u.`phone`, '---') phone, IFNULL(u.`email`, '---') email, u.`job_state`
+ FROM `user` u, role r
+ WHERE u.`role_id` = r.`id`
+ <if test="name != null">
+ AND u.name = #{name}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3