From 4fae0a3d70ce519502c8ef17f327daffbe9a44aa Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期三, 19 七月 2023 11:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
user-server/src/main/resources/mapper/UserMapper.xml | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 30e710c..65aa6bb 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -3,11 +3,10 @@
<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">
--
Gitblit v1.9.3