From 5541562a51ddec2c25fcd6cd3febbc4765a2190d Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期六, 20 七月 2024 10:37:32 +0800
Subject: [PATCH] deviceNo get product
---
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 8a99862..59557e2 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -117,17 +117,17 @@
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
count(*)
from ba_role r
- inner join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
- where r.disabled!=1 and r.deleted!=1
+ left join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
+ where r.deleted!=1
<trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
r.name like concat('%', #{name}, '%') and
@@ -136,7 +136,7 @@
r.disabled =#{disabled,jdbcType=BOOLEAN} and
</if>
<if test="dt != null and dt != ''">
- DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
+ DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP}
</if>
</trim>
</select>
@@ -147,8 +147,8 @@
<property name="alias" value="r"/>
</include>
from ba_role r
- inner join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
- where r.disabled!=1 and r.deleted!=1
+ left join (select DISTINCT role_id from ba_role_privilege) rp on r.id=rp.role_id
+ where r.deleted!=1
<trim prefix="and" suffixOverrides="and">
<if test="name != null and name != ''">
r.name like concat('%', #{name}, '%') and
@@ -157,7 +157,7 @@
r.disabled =#{disabled,jdbcType=BOOLEAN} and
</if>
<if test="dt != null and dt != ''">
- DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP} and
+ DATE_FORMAT(r.dt, '%Y-%m-%d') = #{dt,jdbcType=TIMESTAMP}
</if>
</trim>
order by id DESC
@@ -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