From 4eb1118aa7e9fe3096fa029f19eba21eb25242d9 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 14 五月 2026 08:12:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_善鼎通讯_pro

---
 src/main/resources/mapper/system/SysRoleMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/system/SysRoleMapper.xml b/src/main/resources/mapper/system/SysRoleMapper.xml
index 92ab684..9e16cf7 100644
--- a/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -62,6 +62,7 @@
 	
 	<select id="selectRoleAll" resultMap="SysRoleResult">
 		<include refid="selectRoleVo"/>
+		WHERE r.del_flag = '0'
 	</select>
 	
 	<select id="selectRoleListByUserId" parameterType="Long" resultType="Long">

--
Gitblit v1.9.3