From f77a2eba10ce3f430d31a34790a8a1184c8069e6 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 11:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/resources/mapper/UserMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index b18997b..8220b5a 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -1,5 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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_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 name!=''">
+ AND u.name = #{name}
+ </if>
+ </select>
+
+ <select id="selectUser" resultType="Map">
+ select id, name
+ from lims_laboratory.user
+ where job_state!=0
+ </select>
</mapper>
--
Gitblit v1.9.3