diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java
index 5d9f1e98..d09499ad 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java
@@ -47,7 +47,8 @@ public class CompanyServiceSupport extends TreeService<CompanyDao, Company>
 	 */
 	@Override
 	public void addDataScopeFilter(Company company, String ctrlPermi) {
-		company.getSqlMap().getDataScope().addFilter("dsf", "Company", "a.company_code", ctrlPermi);
+		company.getSqlMap().getDataScope().addFilter("dsf", "Company", "a.company_code",
+				null, ctrlPermi, "office_user");
 	}
 
 	/**
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
index 47481258..d2cc8f29 100644
--- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
+++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
@@ -62,10 +62,10 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
 	@Override
 	public void addDataScopeFilter(EmpUser empUser, String ctrlPermi) {
 		empUser.getSqlMap().getDataScope().addFilter("dsfOffice",
-				"Office", "e.office_code", "a.create_by", ctrlPermi);
+				"Office", "e.office_code", "a.create_by", ctrlPermi, "office_user");
 		if (StringUtils.isNotBlank(EmpUtils.getCompany().getCompanyCode())){
 			empUser.getSqlMap().getDataScope().addFilter("dsfCompany",
-					"Company", "e.company_code", "a.create_by", ctrlPermi);
+					"Company", "e.company_code", "a.create_by", ctrlPermi, "office_user");
 		}
 	}
 
diff --git a/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.6.sql b/modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.6.sql
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql
new file mode 100644
index 00000000..9d0f10b4
--- /dev/null
+++ b/modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql
@@ -0,0 +1,10 @@
+
+-- 角色表增加适应业务范围
+ALTER TABLE `${_prefix}sys_role` 
+ADD COLUMN `biz_scope` varchar(255) NULL COMMENT '适应业务范围（不同的功能，不同的数据权限支持）' AFTER `data_scope`;
+
+-- 角色业务范围字典数据
+INSERT INTO `${_prefix}sys_dict_type`(`id`, `dict_name`, `dict_type`, `is_sys`, `status`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`) 
+VALUES ('1149344200121085952', '角色业务范围', 'sys_role_biz_scope', '1', '0', 'system', now(), 'system', now(), '');
+INSERT INTO `${_prefix}sys_dict_data`(`dict_code`, `parent_code`, `parent_codes`, `tree_sort`, `tree_sorts`, `tree_leaf`, `tree_level`, `tree_names`, `dict_label`, `dict_value`, `dict_type`, `is_sys`, `description`, `css_style`, `css_class`, `status`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `corp_code`, `corp_name`, `extend_s1`, `extend_s2`, `extend_s3`, `extend_s4`, `extend_s5`, `extend_s6`, `extend_s7`, `extend_s8`, `extend_i1`, `extend_i2`, `extend_i3`, `extend_i4`, `extend_f1`, `extend_f2`, `extend_f3`, `extend_f4`, `extend_d1`, `extend_d2`, `extend_d3`, `extend_d4`) 
+VALUES ('1149344606834356224', '0', '0,', 30, '0000000030,', '1', 0, '组织管理', '组织管理', 'office_user', 'sys_role_biz_scope', '1', '', '', '', '0', 'system', now(), 'system', now(), '', '0', 'JeeSite', '', '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.6.sql b/modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.6.sql
new file mode 100644
index 00000000..e69de29b
diff --git a/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.6.sql b/modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.6.sql
new file mode 100644
index 00000000..e69de29b