2025-04-15

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;
     }

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">