From 7e97eb30c78c7e463de0d409fb0d4882258e00a4 Mon Sep 17 00:00:00 2001
From: yinhuaiwei <yinhuaiwei@ht-atia.com>
Date: Mon, 9 Nov 2026 11:37:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/SysMenuMapper.xml        | 2 +-
 .../src/main/resources/mapper/system/SysPostMapper.xml        | 1 +
 .../src/main/resources/mapper/system/SysRoleMapper.xml        | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/inspect-management/src/main/resources/mapper/system/SysMenuMapper.xml b/inspect-management/src/main/resources/mapper/system/SysMenuMapper.xml
index 7bb3351..284d8b8 100644
--- a/inspect-management/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/inspect-management/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -110,7 +110,7 @@
         left join sys_role_menu rm on m.menu_id = rm.menu_id
         left join sys_user_role ur on rm.role_id = ur.role_id
         left join sys_role ro on ur.role_id = ro.role_id
-        where ur.user_id = #{params.userId} and m.type = 0
+        where ur.user_id = #{params.userId}
         <if test="menuName != null and menuName != ''">
             AND m.menu_name like concat('%', #{menuName}, '%')
         </if>
diff --git a/inspect-management/src/main/resources/mapper/system/SysPostMapper.xml b/inspect-management/src/main/resources/mapper/system/SysPostMapper.xml
index ddb5dd3..7ec9759 100644
--- a/inspect-management/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/inspect-management/src/main/resources/mapper/system/SysPostMapper.xml
@@ -46,6 +46,7 @@
 
     <select id="selectPostAll" resultMap="SysPostResult">
         <include refid="selectPostVo"/>
+        order by post_sort
     </select>
 
     <select id="selectPostById" parameterType="Long" resultMap="SysPostResult">
diff --git a/inspect-management/src/main/resources/mapper/system/SysRoleMapper.xml b/inspect-management/src/main/resources/mapper/system/SysRoleMapper.xml
index 2fdf77f..49958e9 100644
--- a/inspect-management/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/inspect-management/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -94,12 +94,12 @@
 
     <select id="checkRoleNameUnique" parameterType="String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_name=#{roleName} limit 1
+        where r.role_name=#{roleName} and r.del_flag = '0' limit 1
     </select>
 
     <select id="checkRoleKeyUnique" parameterType="String" resultMap="SysRoleResult">
         <include refid="selectRoleVo"/>
-        where r.role_key=#{roleKey} limit 1
+        where r.role_key=#{roleKey} and r.del_flag = '0' limit 1
     </select>
 
     <insert id="insertRole" parameterType="SysRole" useGeneratedKeys="true" keyProperty="roleId">