From feb290a268428fec3f331d09c51894de5728ebc1 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 16:13:04 +0800
Subject: [PATCH] fix order test error
---
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index d395263..f8e99c5 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -67,7 +67,7 @@
<if test="id != null">
id,
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
`name`,
</if>
<if test="disabled != null">
@@ -81,7 +81,7 @@
<if test="id != null">
#{id},
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
#{name},
</if>
<if test="disabled != null">
@@ -96,7 +96,7 @@
<!--@mbg.generated-->
update ba_role
<set>
- <if test="name != null">
+ <if test="name != null and name !=''">
`name` = #{name},
</if>
<if test="disabled != null">
@@ -132,7 +132,7 @@
<if test="name != null and name != ''">
r.name like concat('%', #{name}, '%') and
</if>
- <if test="disabled != null and disabled != ''">
+ <if test="disabled != null">
r.disabled =#{disabled,jdbcType=BOOLEAN} and
</if>
<if test="dt != null and dt != ''">
@@ -153,7 +153,7 @@
<if test="name != null and name != ''">
r.name like concat('%', #{name}, '%') and
</if>
- <if test="disabled != null and disabled != ''">
+ <if test="disabled != null">
r.disabled =#{disabled,jdbcType=BOOLEAN} and
</if>
<if test="dt != null and dt != ''">
@@ -167,4 +167,11 @@
</if>
</trim>
</select>
+ <select id="selectAll" resultType="com.dy.pmsGlobal.pojoBa.BaRole">
+ select
+ <include refid="Base_Column_List" />
+ from ba_role
+ where deleted != 1 and disabled !=1
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0