From 577e0a85145f4341ccad471ff2ecd9012f4a3d25 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 12 Jul 2019 11:29:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=9A=E5=8A=A1=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E6=AF=94=E5=A6=82=E6=9C=89=E7=9A=84=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=9C=8B=E6=9C=AC=E9=83=A8=E9=97=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E6=9C=89=E7=9A=84=E5=8A=9F=E8=83=BD=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=9C=8B=E6=9C=AC=E5=85=AC=E5=8F=B8=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/service/support/CompanyServiceSupport.java | 3 ++- .../sys/service/support/EmpUserServiceSupport.java | 4 ++-- .../resources/db/upgrade/core/mssql/mssql_4.1.6.sql | 0 .../resources/db/upgrade/core/mysql/mysql_4.1.6.sql | 10 ++++++++++ .../resources/db/upgrade/core/oracle/oracle_4.1.6.sql | 0 .../db/upgrade/core/postgresql/postgresql_4.1.6.sql | 0 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 modules/core/src/main/resources/db/upgrade/core/mssql/mssql_4.1.6.sql create mode 100644 modules/core/src/main/resources/db/upgrade/core/mysql/mysql_4.1.6.sql create mode 100644 modules/core/src/main/resources/db/upgrade/core/oracle/oracle_4.1.6.sql create mode 100644 modules/core/src/main/resources/db/upgrade/core/postgresql/postgresql_4.1.6.sql 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 */ @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 @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