From 11cb036526815aa3d2df00b9537e1fd4b52a4fdf Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Tue, 15 Apr 2025 16:26:07 +0800
Subject: [PATCH] 2025-04-15

---
 .../java/com/spring/modules/base/data/RoleData.java    | 10 ++++++++++
 src/main/resources/mapper/base/BaseMapper.xml          |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/spring/modules/base/data/RoleData.java b/src/main/java/com/spring/modules/base/data/RoleData.java
index ac703481..f6a0a529 100644
--- a/src/main/java/com/spring/modules/base/data/RoleData.java
+++ b/src/main/java/com/spring/modules/base/data/RoleData.java
@@ -9,6 +9,16 @@ public class RoleData extends Role {
 
     private String siteID;
 
+    private String type;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getSiteID() {
         return siteID;
     }
diff --git a/src/main/resources/mapper/base/BaseMapper.xml b/src/main/resources/mapper/base/BaseMapper.xml
index b51925aa..d03aa396 100644
--- a/src/main/resources/mapper/base/BaseMapper.xml
+++ b/src/main/resources/mapper/base/BaseMapper.xml
@@ -411,13 +411,14 @@
     </select>
 
     <select id="getRoleList" resultType="com.spring.modules.base.data.RoleData">
-        select id,site,role_no,role_desc,remark,active from Role
+        select id,site,role_no,role_desc,remark,active,type from Role
         <where>
             and site=#{site}
             <if test="active != null and active != ''">
                 AND Active = #{active}
             </if>
         </where>
+        order by type , role_no
     </select>
 
     <delete id="deleteAccessFieldWithUser">