From d82642e04f2dd9f2dc04dd7196a1e83fcfc95913 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 27 八月 2024 11:31:40 +0800
Subject: [PATCH] order status
---
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 d3fb7b3..efe0700 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -42,7 +42,7 @@
from ba_role r
inner join ba_user_role ur on r.id = ur.role_id
where r.deleted != 1
- <if test="userId != null">
+ <if test="userId != null and userId !=''">
and ur.user_id = #{userId}
</if>
</select>
@@ -64,30 +64,30 @@
<!--@mbg.generated-->
insert into ba_role
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null">
+ <if test="id != null and id !=''">
id,
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
`name`,
</if>
- <if test="disabled != null">
+ <if test="disabled != null and disabled !=''">
disabled,
</if>
- <if test="deleted != null">
+ <if test="deleted != null and deleted !=''">
deleted,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="id != null">
+ <if test="id != null and id !=''">
#{id},
</if>
- <if test="name != null">
+ <if test="name != null and name !=''">
#{name},
</if>
- <if test="disabled != null">
+ <if test="disabled != null and disabled !=''">
#{disabled},
</if>
- <if test="deleted != null">
+ <if test="deleted != null and deleted !=''">
#{deleted},
</if>
</trim>
@@ -96,13 +96,13 @@
<!--@mbg.generated-->
update ba_role
<set>
- <if test="name != null">
+ <if test="name != null and name !=''">
`name` = #{name},
</if>
- <if test="disabled != null">
+ <if test="disabled != null and disabled !=''">
disabled = #{disabled},
</if>
- <if test="deleted != null">
+ <if test="deleted != null and deleted !=''">
deleted = #{deleted},
</if>
</set>
@@ -117,10 +117,10 @@
where id = #{id}
</update>
- <delete id="deleteLogicById" parameterType="java.lang.Long">
+ <update id="deleteLogicById" parameterType="java.lang.Long">
update ba_role set deleted = 1
where id = #{id}
- </delete>
+ </update>
<select id="selectSomeCount" resultType="java.lang.Long">
select
@@ -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