From 5e89d14d364f2403ae2d64ab1a70d004ae36eb6c Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期一, 29 四月 2024 16:35:17 +0800
Subject: [PATCH] 角色管理方法修改
---
pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..d3fb7b3 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -126,8 +126,8 @@
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
--
Gitblit v1.8.0