From a303cd042ed27bdf2b8daaf3d3bc23f1ef9956af Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期二, 15 八月 2023 17:59:23 +0800
Subject: [PATCH] 设备台账

---
 user-server/src/main/resources/mapper/UserMapper.xml |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index d5d6190..4a8eb08 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -32,26 +32,13 @@
         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">
+        <if test="name != null and name!=''">
             AND u.name = #{name}
         </if>
     </select>
 
-    <select id="selectUser" resultType="com.yuanchu.limslaboratory.pojo.User">
-        select id,
-               account,
-               password,
-               name,
-               phone,
-               email,
-               age,
-               job_state,
-               info,
-               create_time,
-               update_time,
-               version,
-               role_id,
-               enterprise_id
+    <select id="selectUser" resultType="Map">
+        select id, name
         from lims_laboratory.user
     </select>
 </mapper>

--
Gitblit v1.9.3