From ec6be9b8b52501389690752e77ff084997595f15 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 10 Mar 2025 17:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=92=8C=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=20sys=5Frole=5Farea?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/api/domain/SysRole.java     | 11 -----------
 .../main/resources/mapper/system/SysRoleMapper.xml    |  6 +-----
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
index 43ab35b..ff366e5 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysRole.java
@@ -41,9 +41,6 @@ public class SysRole extends BaseEntity
     @Excel(name = "角色排序")
     private Integer roleSort;
 
-    /** 数据类型(1-组织类,2-区域类) */
-    private Integer dataType;
-
     /** 数据类型(1-全数据类, 2-组织类,3-商户类) */
     private Integer roleType;
 
@@ -154,14 +151,6 @@ public class SysRole extends BaseEntity
         this.roleSort = roleSort;
     }
 
-    public Integer getDataType() {
-        return dataType;
-    }
-
-    public void setDataType(Integer dataType) {
-        this.dataType = dataType;
-    }
-
     public Integer getRoleType() {
         return roleType;
     }
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
index fd43a20..f1cf515 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -10,7 +10,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="roleKey"            column="role_key"              />
 		<result property="roleSort"           column="role_sort"             />
 		<result property="roleType"           column="role_type"             />
-		<result property="dataType"           column="data_type"             />
 		<result property="dataScope"          column="data_scope"            />
 		<result property="menuCheckStrictly"  column="menu_check_strictly"   />
 		<result property="deptCheckStrictly"  column="dept_check_strictly"   />
@@ -27,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</resultMap>
 
 	<sql id="selectRoleVo">
-	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_type, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
+	    select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
             r.company_id, r.status, r.del_flag, r.create_time, r.remark, r.is_built_in, r.area_id, role_type
         from sys_role r
 	        left join sys_user_role ur on ur.role_id = r.role_id
@@ -116,7 +115,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="roleKey != null and roleKey != ''">role_key,</if>
  			<if test="roleSort != null">role_sort,</if>
 		    <if test="roleType != null and roleType != ''">role_type,</if>
-		    <if test="dataType != null and dataType != ''">data_type,</if>
  			<if test="dataScope != null and dataScope != ''">data_scope,</if>
  			<if test="menuCheckStrictly != null">menu_check_strictly,</if>
  			<if test="deptCheckStrictly != null">dept_check_strictly,</if>
@@ -133,7 +131,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="roleKey != null and roleKey != ''">#{roleKey},</if>
  			<if test="roleSort != null">#{roleSort},</if>
 		    <if test="roleType != null and roleType != ''">#{roleType},</if>
-		    <if test="dataType != null and dataType != ''">#{dataType},</if>
  			<if test="dataScope != null and dataScope != ''">#{dataScope},</if>
  			<if test="menuCheckStrictly != null">#{menuCheckStrictly},</if>
  			<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
@@ -154,7 +151,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="roleKey != null and roleKey != ''">role_key = #{roleKey},</if>
  			<if test="roleSort != null">role_sort = #{roleSort},</if>
 			<if test="roleType != null and roleType != ''">role_type = #{roleType},</if>
-			<if test="dataType != null and dataType != ''">data_type = #{dataType},</if>
  			<if test="dataScope != null and dataScope != ''">data_scope = #{dataScope},</if>
  			<if test="menuCheckStrictly != null">menu_check_strictly = #{menuCheckStrictly},</if>
  			<if test="deptCheckStrictly != null">dept_check_strictly = #{deptCheckStrictly},</if>