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 | 20 ++++----------------
1 files changed, 4 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..8220b5a 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -32,26 +32,14 @@
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
+ where job_state!=0
</select>
</mapper>
--
Gitblit v1.9.3