From 5e75ef24e5dd45ae934dc7f03f6c7736ca73c9ff Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 15:01:32 +0800
Subject: [PATCH] fix order search
---
pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
index 4926dde..12b158a 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaUserMapper.xml
@@ -76,7 +76,6 @@
select
count(*)
from ba_user
- where supper_admin!=1 and deleted!=1
</select>
<select id="login" resultMap="loginResultMap" >
select
@@ -106,7 +105,7 @@
<if test="phone != null and phone !=''">
bu.phone = #{phone,jdbcType=VARCHAR} and
</if>
-<!-- <if test="roleId != null">-->
+<!-- <if test="roleId != null and roleId !=''">-->
<!-- ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!-- </if>-->
<if test="disabled != null">
@@ -127,7 +126,7 @@
<if test="phone != null and phone !=''">
bu.phone = #{phone,jdbcType=VARCHAR} and
</if>
-<!-- <if test="roleId != null">-->
+<!-- <if test="roleId != null and roleId !=''">-->
<!-- ur.role_id=#{roleId,jdbcType=BIGINT} and-->
<!-- </if>-->
<if test="disabled != null">
@@ -143,7 +142,7 @@
</select>
<select id="selectNamesByAssistants" parameterType="java.lang.String" resultType="java.lang.String">
SELECT GROUP_CONCAT(name) AS assistantNames FROM ba_user WHERE id IN
- <if test="assistants != null">
+ <if test="assistants != null and assistants !=''">
<foreach collection="assistants.split(',')" item="item" separator="," open="(" close=")">
#{item,jdbcType=BIGINT}
</foreach>
@@ -174,16 +173,16 @@
<if test="id != null">
id,
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
`name`,
</if>
- <if test="phone != null">
+ <if test="phone!= null and phone !=''">
phone,
</if>
- <if test="password != null">
+ <if test="password!= null and password !=''">
`password`,
</if>
- <if test="supperAdmin != null">
+ <if test="supperAdmin!= null and supperAdmin !=''">
supper_admin,
</if>
<if test="disabled != null">
@@ -197,16 +196,16 @@
<if test="id != null">
#{id},
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
#{name},
</if>
- <if test="phone != null">
+ <if test="phone!= null and phone !=''">
#{phone},
</if>
- <if test="password != null">
+ <if test="password!= null and password !=''">
#{password},
</if>
- <if test="supperAdmin != null">
+ <if test="supperAdmin!= null and supperAdmin !=''">
#{supperAdmin},
</if>
<if test="disabled != null">
@@ -221,16 +220,16 @@
<!--@mbg.generated-->
update ba_user
<set>
- <if test="name != null">
+ <if test="name != null and name !=''">
`name` = #{name},
</if>
- <if test="phone != null">
+ <if test="phone!= null and phone !=''">
phone = #{phone},
</if>
- <if test="password != null">
+ <if test="password!= null and password !=''">
`password` = #{password},
</if>
- <if test="supperAdmin != null">
+ <if test="supperAdmin!= null and supperAdmin !=''">
supper_admin = #{supperAdmin},
</if>
<if test="disabled != null">
--
Gitblit v1.8.0