新增 按菜单进行数据权限授权，后端通过addFilterByPermission方法调用权限。

modules/core/db/db2/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE js_biz_category
+(
+	category_code varchar(64) NOT NULL,
+	view_code varchar(500),
+	category_name varchar(64) NOT NULL,
+	parent_code varchar(64) NOT NULL,
+	parent_codes varchar(767) NOT NULL,
+	tree_sort decimal(10) NOT NULL,
+	tree_sorts varchar(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level decimal(4) NOT NULL,
+	tree_names varchar(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date timestamp NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date timestamp NOT NULL,
+	remarks vargraphic(500),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+);
+
+
 -- 代码生成表
 CREATE TABLE js_gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE js_sys_area
 );
 
 
--- 业务分类
-CREATE TABLE js_biz_category
-(
-	category_code varchar(64) NOT NULL,
-	view_code varchar(500),
-	category_name varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks vargraphic(500),
-	corp_code varchar(64) DEFAULT '0' NOT NULL,
-	corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-);
-
-
 -- 公司表
 CREATE TABLE js_sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE js_sys_menu
 );
 
 
+-- 菜单数据权限
+CREATE TABLE js_sys_menu_data_scope
+(
+	id varchar(64) NOT NULL,
+	role_code varchar(64) NOT NULL,
+	menu_code varchar(64) NOT NULL,
+	rule_name varchar(100),
+	rule_type char(1),
+	rule_config clob,
+	status char(1),
+	remarks vargraphic(500),
+	PRIMARY KEY (id)
+);
+
+
 -- 模块表
 CREATE TABLE js_sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE js_sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL,
 	ctrl_data varchar(64) NOT NULL,
 	ctrl_permi varchar(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON js_sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON js_sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);

modules/core/db/h2/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE js_biz_category
+(
+	category_code varchar(64) NOT NULL,
+	view_code varchar(500),
+	category_name varchar(64) NOT NULL,
+	parent_code varchar(64) NOT NULL,
+	parent_codes varchar(767) NOT NULL,
+	tree_sort decimal(10) NOT NULL,
+	tree_sorts varchar(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level decimal(4) NOT NULL,
+	tree_names varchar(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date datetime NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date datetime NOT NULL,
+	remarks varchar(500),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+);
+
+
 -- 代码生成表
 CREATE TABLE js_gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE js_sys_area
 );
 
 
--- 业务分类
-CREATE TABLE js_biz_category
-(
-	category_code varchar(64) NOT NULL,
-	view_code varchar(500),
-	category_name varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	corp_code varchar(64) DEFAULT '0' NOT NULL,
-	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-);
-
-
 -- 公司表
 CREATE TABLE js_sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE js_sys_menu
 );
 
 
+-- 菜单数据权限
+CREATE TABLE js_sys_menu_data_scope
+(
+	id varchar(64) NOT NULL,
+	role_code varchar(64) NOT NULL,
+	menu_code varchar(64) NOT NULL,
+	rule_name varchar(100),
+	rule_type char(1),
+	rule_config clob,
+	status char(1),
+	remarks varchar(500),
+	PRIMARY KEY (id)
+);
+
+
 -- 模块表
 CREATE TABLE js_sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE js_sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL,
 	ctrl_data varchar(64) NOT NULL,
 	ctrl_permi varchar(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON js_sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON js_sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);
@@ -999,6 +1017,25 @@ CREATE INDEX idx_sys_user_cc ON js_sys_user (corp_code);
 
 /* Comments */
 
+COMMENT ON TABLE js_biz_category IS '业务分类';
+COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN js_biz_category.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
+COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
+COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE js_gen_table IS '代码生成表';
 COMMENT ON COLUMN js_gen_table.table_name IS '表名';
 COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称';
@@ -1058,25 +1095,6 @@ COMMENT ON COLUMN js_sys_area.create_date IS '创建时间';
 COMMENT ON COLUMN js_sys_area.update_by IS '更新者';
 COMMENT ON COLUMN js_sys_area.update_date IS '更新时间';
 COMMENT ON COLUMN js_sys_area.remarks IS '备注信息';
-COMMENT ON TABLE js_biz_category IS '业务分类';
-COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN js_biz_category.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
-COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
-COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE js_sys_company IS '公司表';
 COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
 COMMENT ON COLUMN js_sys_company.view_code IS '公司代码';
@@ -1375,6 +1393,15 @@ COMMENT ON COLUMN js_sys_menu.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN js_sys_menu.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN js_sys_menu.extend_d4 IS '扩展 Date 4';
 COMMENT ON COLUMN js_sys_menu.extend_json IS '扩展 JSON';
+COMMENT ON TABLE js_sys_menu_data_scope IS '菜单数据权限';
+COMMENT ON COLUMN js_sys_menu_data_scope.id IS '编号';
+COMMENT ON COLUMN js_sys_menu_data_scope.role_code IS '角色编码';
+COMMENT ON COLUMN js_sys_menu_data_scope.menu_code IS '菜单编码';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_name IS '规则名称';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_type IS '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_config IS '规则配置（JSON）';
+COMMENT ON COLUMN js_sys_menu_data_scope.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN js_sys_menu_data_scope.remarks IS '备注信息';
 COMMENT ON TABLE js_sys_module IS '模块表';
 COMMENT ON COLUMN js_sys_module.module_code IS '模块编码';
 COMMENT ON COLUMN js_sys_module.module_name IS '模块名称';
@@ -1551,7 +1578,7 @@ COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）';
 COMMENT ON COLUMN js_sys_role.is_show IS '是否显示';
 COMMENT ON COLUMN js_sys_role.user_type IS '用户类型（employee员工 member会员）';
 COMMENT ON COLUMN js_sys_role.desktop_url IS '桌面地址（仪表盘地址）';
-COMMENT ON COLUMN js_sys_role.data_scope IS '数据范围设置（0未设置  1全部数据 2自定义数据）';
+COMMENT ON COLUMN js_sys_role.data_scope IS '数据范围（0未设置 1全部数据 2自定义数据）';
 COMMENT ON COLUMN js_sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
 COMMENT ON COLUMN js_sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
 COMMENT ON COLUMN js_sys_role.status IS '状态（0正常 1删除 2停用）';
@@ -1588,6 +1615,7 @@ COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_data IS '控制数据';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_permi IS '控制权限';
+COMMENT ON COLUMN js_sys_role_data_scope.menu_code IS '菜单编码';
 COMMENT ON TABLE js_sys_role_menu IS '角色与菜单关联表';
 COMMENT ON COLUMN js_sys_role_menu.role_code IS '角色编码';
 COMMENT ON COLUMN js_sys_role_menu.menu_code IS '菜单编码';

modules/core/db/mssql/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE [js_biz_category]
+(
+	[category_code] varchar(64) NOT NULL,
+	[view_code] varchar(500),
+	[category_name] varchar(64) NOT NULL,
+	[parent_code] varchar(64) NOT NULL,
+	[parent_codes] varchar(767) NOT NULL,
+	[tree_sort] decimal(10) NOT NULL,
+	[tree_sorts] varchar(767) NOT NULL,
+	[tree_leaf] char(1) NOT NULL,
+	[tree_level] decimal(4) NOT NULL,
+	[tree_names] varchar(767) NOT NULL,
+	[status] char(1) DEFAULT '0' NOT NULL,
+	[create_by] varchar(64) NOT NULL,
+	[create_date] datetime NOT NULL,
+	[update_by] varchar(64) NOT NULL,
+	[update_date] datetime NOT NULL,
+	[remarks] nvarchar(500),
+	[corp_code] varchar(64) DEFAULT '0' NOT NULL,
+	[corp_name] nvarchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY ([category_code])
+);
+
+
 -- 代码生成表
 CREATE TABLE [js_gen_table]
 (
@@ -79,31 +104,6 @@ CREATE TABLE [js_sys_area]
 );
 
 
--- 业务分类
-CREATE TABLE [js_biz_category]
-(
-	[category_code] varchar(64) NOT NULL,
-	[view_code] varchar(500),
-	[category_name] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	[corp_code] varchar(64) DEFAULT '0' NOT NULL,
-	[corp_name] nvarchar(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY ([category_code])
-);
-
-
 -- 公司表
 CREATE TABLE [js_sys_company]
 (
@@ -492,6 +492,21 @@ CREATE TABLE [js_sys_menu]
 );
 
 
+-- 菜单数据权限
+CREATE TABLE [js_sys_menu_data_scope]
+(
+	[id] varchar(64) NOT NULL,
+	[role_code] varchar(64) NOT NULL,
+	[menu_code] varchar(64) NOT NULL,
+	[rule_name] varchar(100),
+	[rule_type] char(1),
+	[rule_config] text,
+	[status] char(1),
+	[remarks] nvarchar(500),
+	PRIMARY KEY ([id])
+);
+
+
 -- 模块表
 CREATE TABLE [js_sys_module]
 (
@@ -767,7 +782,8 @@ CREATE TABLE [js_sys_role_data_scope]
 	[ctrl_type] varchar(20) NOT NULL,
 	[ctrl_data] varchar(64) NOT NULL,
 	[ctrl_permi] varchar(64) NOT NULL,
-	PRIMARY KEY ([role_code], [ctrl_type], [ctrl_data], [ctrl_permi])
+	[menu_code] varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY ([role_code], [ctrl_type], [ctrl_data], [ctrl_permi], [menu_code])
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX [idx_sys_menu_sc] ON [js_sys_menu] ([sys_code]);
 CREATE INDEX [idx_sys_menu_is] ON [js_sys_menu] ([is_show]);
 CREATE INDEX [idx_sys_menu_mcs] ON [js_sys_menu] ([module_codes]);
 CREATE INDEX [idx_sys_menu_wt] ON [js_sys_menu] ([weight]);
+CREATE INDEX [idx_sys_menu_ds_mc] ON [js_sys_menu_data_scope] ([menu_code]);
+CREATE INDEX [idx_sys_menu_ds_rc] ON [js_sys_menu_data_scope] ([role_code]);
 CREATE INDEX [idx_sys_module_status] ON [js_sys_module] ([status]);
 CREATE INDEX [idx_sys_msg_inner_cb] ON [js_sys_msg_inner] ([create_by]);
 CREATE INDEX [idx_sys_msg_inner_status] ON [js_sys_msg_inner] ([status]);

modules/core/db/mysql/core.sql

@@ -3,6 +3,31 @@ SET SESSION FOREIGN_KEY_CHECKS=0;
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE js_biz_category
+(
+	category_code varchar(64) NOT NULL COMMENT '流程分类',
+	view_code varchar(500) COMMENT '分类代码',
+	category_name varchar(64) NOT NULL COMMENT '分类名称',
+	parent_code varchar(64) NOT NULL COMMENT '父级编号',
+	parent_codes varchar(767) NOT NULL COMMENT '所有父级编号',
+	tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
+	tree_sorts varchar(767) NOT NULL COMMENT '所有排序号',
+	tree_leaf char(1) NOT NULL COMMENT '是否最末级',
+	tree_level decimal(4) NOT NULL COMMENT '层次级别',
+	tree_names varchar(767) NOT NULL COMMENT '全节点名',
+	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
+	create_by varchar(64) NOT NULL COMMENT '创建者',
+	create_date datetime NOT NULL COMMENT '创建时间',
+	update_by varchar(64) NOT NULL COMMENT '更新者',
+	update_date datetime NOT NULL COMMENT '更新时间',
+	remarks varchar(500) COMMENT '备注信息',
+	corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码',
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称',
+	PRIMARY KEY (category_code)
+) COMMENT = '业务分类';
+
+
 -- 代码生成表
 CREATE TABLE js_gen_table
 (
@@ -80,31 +105,6 @@ CREATE TABLE js_sys_area
 ) COMMENT = '行政区划';
 
 
--- 业务分类
-CREATE TABLE js_biz_category
-(
-	category_code varchar(64) NOT NULL COMMENT '流程分类',
-	view_code varchar(500) COMMENT '分类代码',
-	category_name varchar(64) NOT NULL COMMENT '分类名称',
-	parent_code varchar(64) NOT NULL COMMENT '父级编号',
-	parent_codes varchar(767) NOT NULL COMMENT '所有父级编号',
-	tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
-	tree_sorts varchar(767) NOT NULL COMMENT '所有排序号',
-	tree_leaf char(1) NOT NULL COMMENT '是否最末级',
-	tree_level decimal(4) NOT NULL COMMENT '层次级别',
-	tree_names varchar(767) NOT NULL COMMENT '全节点名',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
-	create_by varchar(64) NOT NULL COMMENT '创建者',
-	create_date datetime NOT NULL COMMENT '创建时间',
-	update_by varchar(64) NOT NULL COMMENT '更新者',
-	update_date datetime NOT NULL COMMENT '更新时间',
-	remarks varchar(500) COMMENT '备注信息',
-	corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码',
-	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称',
-	PRIMARY KEY (category_code)
-) COMMENT = '业务分类';
-
-
 -- 公司表
 CREATE TABLE js_sys_company
 (
@@ -493,6 +493,21 @@ CREATE TABLE js_sys_menu
 ) COMMENT = '菜单表';
 
 
+-- 菜单数据权限
+CREATE TABLE js_sys_menu_data_scope
+(
+	id varchar(64) NOT NULL COMMENT '编号',
+	role_code varchar(64) NOT NULL COMMENT '角色编码',
+	menu_code varchar(64) NOT NULL COMMENT '菜单编码',
+	rule_name varchar(100) COMMENT '规则名称',
+	rule_type char(1) COMMENT '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）',
+	rule_config text COMMENT '规则配置（JSON）',
+	status char(1) COMMENT '状态（0正常 1删除 2停用）',
+	remarks varchar(500) COMMENT '备注信息',
+	PRIMARY KEY (id)
+) COMMENT = '菜单数据权限';
+
+
 -- 模块表
 CREATE TABLE js_sys_module
 (
@@ -725,7 +740,7 @@ CREATE TABLE js_sys_role
 	is_show char(1) DEFAULT '1' COMMENT '是否显示',
 	user_type varchar(16) COMMENT '用户类型（employee员工 member会员）',
 	desktop_url varchar(255) COMMENT '桌面地址（仪表盘地址）',
-	data_scope char(1) COMMENT '数据范围设置（0未设置  1全部数据 2自定义数据）',
+	data_scope char(1) COMMENT '数据范围（0未设置 1全部数据 2自定义数据）',
 	biz_scope varchar(255) COMMENT '适应业务范围（不同的功能，不同的数据权限支持）',
 	sys_codes varchar(500) COMMENT '包含系统（多个用逗号隔开）',
 	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
@@ -768,7 +783,8 @@ CREATE TABLE js_sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL COMMENT '控制类型',
 	ctrl_data varchar(64) NOT NULL COMMENT '控制数据',
 	ctrl_permi varchar(64) NOT NULL COMMENT '控制权限',
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL COMMENT '菜单编码',
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 ) COMMENT = '角色数据权限表';
 
 
@@ -935,6 +951,8 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code ASC);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show ASC);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes ASC);
 CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight ASC);
+CREATE INDEX idx_sys_menu_ds_mc ON js_sys_menu_data_scope (menu_code ASC);
+CREATE INDEX idx_sys_menu_ds_rc ON js_sys_menu_data_scope (role_code ASC);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status ASC);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by ASC);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status ASC);

modules/core/db/oracle/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE js_biz_category
+(
+	category_code varchar2(64) NOT NULL,
+	view_code varchar2(500),
+	category_name varchar2(64) NOT NULL,
+	parent_code varchar2(64) NOT NULL,
+	parent_codes varchar2(767) NOT NULL,
+	tree_sort number(10) NOT NULL,
+	tree_sorts varchar2(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level number(4) NOT NULL,
+	tree_names varchar2(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar2(64) NOT NULL,
+	create_date timestamp NOT NULL,
+	update_by varchar2(64) NOT NULL,
+	update_date timestamp NOT NULL,
+	remarks nvarchar2(500),
+	corp_code varchar2(64) DEFAULT '0' NOT NULL,
+	corp_name nvarchar2(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+);
+
+
 -- 代码生成表
 CREATE TABLE js_gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE js_sys_area
 );
 
 
--- 业务分类
-CREATE TABLE js_biz_category
-(
-	category_code varchar2(64) NOT NULL,
-	view_code varchar2(500),
-	category_name varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	corp_code varchar2(64) DEFAULT '0' NOT NULL,
-	corp_name nvarchar2(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-);
-
-
 -- 公司表
 CREATE TABLE js_sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE js_sys_menu
 );
 
 
+-- 菜单数据权限
+CREATE TABLE js_sys_menu_data_scope
+(
+	id varchar2(64) NOT NULL,
+	role_code varchar2(64) NOT NULL,
+	menu_code varchar2(64) NOT NULL,
+	rule_name varchar2(100),
+	rule_type char(1),
+	rule_config clob,
+	status char(1),
+	remarks nvarchar2(500),
+	PRIMARY KEY (id)
+);
+
+
 -- 模块表
 CREATE TABLE js_sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE js_sys_role_data_scope
 	ctrl_type varchar2(20) NOT NULL,
 	ctrl_data varchar2(64) NOT NULL,
 	ctrl_permi varchar2(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar2(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON js_sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON js_sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);
@@ -999,6 +1017,25 @@ CREATE INDEX idx_sys_user_cc ON js_sys_user (corp_code);
 
 /* Comments */
 
+COMMENT ON TABLE js_biz_category IS '业务分类';
+COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN js_biz_category.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
+COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
+COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE js_gen_table IS '代码生成表';
 COMMENT ON COLUMN js_gen_table.table_name IS '表名';
 COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称';
@@ -1058,25 +1095,6 @@ COMMENT ON COLUMN js_sys_area.create_date IS '创建时间';
 COMMENT ON COLUMN js_sys_area.update_by IS '更新者';
 COMMENT ON COLUMN js_sys_area.update_date IS '更新时间';
 COMMENT ON COLUMN js_sys_area.remarks IS '备注信息';
-COMMENT ON TABLE js_biz_category IS '业务分类';
-COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN js_biz_category.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
-COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
-COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE js_sys_company IS '公司表';
 COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
 COMMENT ON COLUMN js_sys_company.view_code IS '公司代码';
@@ -1375,6 +1393,15 @@ COMMENT ON COLUMN js_sys_menu.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN js_sys_menu.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN js_sys_menu.extend_d4 IS '扩展 Date 4';
 COMMENT ON COLUMN js_sys_menu.extend_json IS '扩展 JSON';
+COMMENT ON TABLE js_sys_menu_data_scope IS '菜单数据权限';
+COMMENT ON COLUMN js_sys_menu_data_scope.id IS '编号';
+COMMENT ON COLUMN js_sys_menu_data_scope.role_code IS '角色编码';
+COMMENT ON COLUMN js_sys_menu_data_scope.menu_code IS '菜单编码';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_name IS '规则名称';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_type IS '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_config IS '规则配置（JSON）';
+COMMENT ON COLUMN js_sys_menu_data_scope.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN js_sys_menu_data_scope.remarks IS '备注信息';
 COMMENT ON TABLE js_sys_module IS '模块表';
 COMMENT ON COLUMN js_sys_module.module_code IS '模块编码';
 COMMENT ON COLUMN js_sys_module.module_name IS '模块名称';
@@ -1551,7 +1578,7 @@ COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）';
 COMMENT ON COLUMN js_sys_role.is_show IS '是否显示';
 COMMENT ON COLUMN js_sys_role.user_type IS '用户类型（employee员工 member会员）';
 COMMENT ON COLUMN js_sys_role.desktop_url IS '桌面地址（仪表盘地址）';
-COMMENT ON COLUMN js_sys_role.data_scope IS '数据范围设置（0未设置  1全部数据 2自定义数据）';
+COMMENT ON COLUMN js_sys_role.data_scope IS '数据范围（0未设置 1全部数据 2自定义数据）';
 COMMENT ON COLUMN js_sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
 COMMENT ON COLUMN js_sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
 COMMENT ON COLUMN js_sys_role.status IS '状态（0正常 1删除 2停用）';
@@ -1588,6 +1615,7 @@ COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_data IS '控制数据';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_permi IS '控制权限';
+COMMENT ON COLUMN js_sys_role_data_scope.menu_code IS '菜单编码';
 COMMENT ON TABLE js_sys_role_menu IS '角色与菜单关联表';
 COMMENT ON COLUMN js_sys_role_menu.role_code IS '角色编码';
 COMMENT ON COLUMN js_sys_role_menu.menu_code IS '菜单编码';

modules/core/db/postgresql/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE js_biz_category
+(
+	category_code varchar(64) NOT NULL,
+	view_code varchar(500),
+	category_name varchar(64) NOT NULL,
+	parent_code varchar(64) NOT NULL,
+	parent_codes varchar(767) NOT NULL,
+	tree_sort decimal(10) NOT NULL,
+	tree_sorts varchar(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level decimal(4) NOT NULL,
+	tree_names varchar(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date timestamp NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date timestamp NOT NULL,
+	remarks varchar(500),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+) WITHOUT OIDS;
+
+
 -- 代码生成表
 CREATE TABLE js_gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE js_sys_area
 ) WITHOUT OIDS;
 
 
--- 业务分类
-CREATE TABLE js_biz_category
-(
-	category_code varchar(64) NOT NULL,
-	view_code varchar(500),
-	category_name varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	corp_code varchar(64) DEFAULT '0' NOT NULL,
-	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-) WITHOUT OIDS;
-
-
 -- 公司表
 CREATE TABLE js_sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE js_sys_menu
 ) WITHOUT OIDS;
 
 
+-- 菜单数据权限
+CREATE TABLE js_sys_menu_data_scope
+(
+	id varchar(64) NOT NULL,
+	role_code varchar(64) NOT NULL,
+	menu_code varchar(64) NOT NULL,
+	rule_name varchar(100),
+	rule_type char(1),
+	rule_config text,
+	status char(1),
+	remarks varchar(500),
+	PRIMARY KEY (id)
+) WITHOUT OIDS;
+
+
 -- 模块表
 CREATE TABLE js_sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE js_sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL,
 	ctrl_data varchar(64) NOT NULL,
 	ctrl_permi varchar(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 ) WITHOUT OIDS;
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON js_sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON js_sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON js_sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON js_sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON js_sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON js_sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON js_sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON js_sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON js_sys_msg_inner (status);
@@ -999,6 +1017,25 @@ CREATE INDEX idx_sys_user_cc ON js_sys_user (corp_code);
 
 /* Comments */
 
+COMMENT ON TABLE js_biz_category IS '业务分类';
+COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN js_biz_category.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
+COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
+COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE js_gen_table IS '代码生成表';
 COMMENT ON COLUMN js_gen_table.table_name IS '表名';
 COMMENT ON COLUMN js_gen_table.class_name IS '实体类名称';
@@ -1058,25 +1095,6 @@ COMMENT ON COLUMN js_sys_area.create_date IS '创建时间';
 COMMENT ON COLUMN js_sys_area.update_by IS '更新者';
 COMMENT ON COLUMN js_sys_area.update_date IS '更新时间';
 COMMENT ON COLUMN js_sys_area.remarks IS '备注信息';
-COMMENT ON TABLE js_biz_category IS '业务分类';
-COMMENT ON COLUMN js_biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN js_biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN js_biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN js_biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN js_biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN js_biz_category.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN js_biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN js_biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN js_biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN js_biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN js_biz_category.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN js_biz_category.create_by IS '创建者';
-COMMENT ON COLUMN js_biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN js_biz_category.update_by IS '更新者';
-COMMENT ON COLUMN js_biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN js_biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN js_biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN js_biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE js_sys_company IS '公司表';
 COMMENT ON COLUMN js_sys_company.company_code IS '公司编码';
 COMMENT ON COLUMN js_sys_company.view_code IS '公司代码';
@@ -1375,6 +1393,15 @@ COMMENT ON COLUMN js_sys_menu.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN js_sys_menu.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN js_sys_menu.extend_d4 IS '扩展 Date 4';
 COMMENT ON COLUMN js_sys_menu.extend_json IS '扩展 JSON';
+COMMENT ON TABLE js_sys_menu_data_scope IS '菜单数据权限';
+COMMENT ON COLUMN js_sys_menu_data_scope.id IS '编号';
+COMMENT ON COLUMN js_sys_menu_data_scope.role_code IS '角色编码';
+COMMENT ON COLUMN js_sys_menu_data_scope.menu_code IS '菜单编码';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_name IS '规则名称';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_type IS '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）';
+COMMENT ON COLUMN js_sys_menu_data_scope.rule_config IS '规则配置（JSON）';
+COMMENT ON COLUMN js_sys_menu_data_scope.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN js_sys_menu_data_scope.remarks IS '备注信息';
 COMMENT ON TABLE js_sys_module IS '模块表';
 COMMENT ON COLUMN js_sys_module.module_code IS '模块编码';
 COMMENT ON COLUMN js_sys_module.module_name IS '模块名称';
@@ -1551,7 +1578,7 @@ COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）';
 COMMENT ON COLUMN js_sys_role.is_show IS '是否显示';
 COMMENT ON COLUMN js_sys_role.user_type IS '用户类型（employee员工 member会员）';
 COMMENT ON COLUMN js_sys_role.desktop_url IS '桌面地址（仪表盘地址）';
-COMMENT ON COLUMN js_sys_role.data_scope IS '数据范围设置（0未设置  1全部数据 2自定义数据）';
+COMMENT ON COLUMN js_sys_role.data_scope IS '数据范围（0未设置 1全部数据 2自定义数据）';
 COMMENT ON COLUMN js_sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
 COMMENT ON COLUMN js_sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
 COMMENT ON COLUMN js_sys_role.status IS '状态（0正常 1删除 2停用）';
@@ -1588,6 +1615,7 @@ COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_data IS '控制数据';
 COMMENT ON COLUMN js_sys_role_data_scope.ctrl_permi IS '控制权限';
+COMMENT ON COLUMN js_sys_role_data_scope.menu_code IS '菜单编码';
 COMMENT ON TABLE js_sys_role_menu IS '角色与菜单关联表';
 COMMENT ON COLUMN js_sys_role_menu.role_code IS '角色编码';
 COMMENT ON COLUMN js_sys_role_menu.menu_code IS '菜单编码';

modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java

@@ -23,13 +23,13 @@ import com.jeesite.modules.sys.service.EmployeeService;
 import com.jeesite.modules.sys.service.UserService;
 import com.jeesite.modules.sys.utils.EmpUtils;
 import com.jeesite.modules.sys.utils.UserUtils;
+import jakarta.annotation.PostConstruct;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import jakarta.annotation.PostConstruct;
 import java.util.List;
 
 /**
@@ -78,6 +78,10 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
 			empUser.sqlMap().getDataScope().addFilter("dsfCompany",
 					"Company", "e.company_code", "a.create_by", ctrlPermi, "office_user");
 		}
+//		empUser.sqlMap().getDataScope().addFilterByPermission("dsfOffice", "sys:empUser:view",
+//				"Office", "e.office_code", "a.create_by", ctrlPermi);
+//		empUser.sqlMap().getDataScope().addFilterByPermission("dsfOffice", "sys:empUser:view",
+//				"User", "a.user_code", ctrlPermi);
 	}
 
 	/**

modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java

@@ -48,6 +48,8 @@ public class OfficeServiceSupport extends TreeService<OfficeDao, Office>
 	public void addDataScopeFilter(Office office, String ctrlPermi) {
 		office.sqlMap().getDataScope().addFilter("dsf", "Office", "a.office_code",
 				null, ctrlPermi , "office_user");
+//		office.sqlMap().getDataScope().addFilterByPermission("dsf", "sys:empUser:view",
+//				"Office", "a.office_code", ctrlPermi);
 	}
 
 	/**

modules/core/src/main/java/com/jeesite/modules/sys/web/RoleController.java

@@ -263,16 +263,58 @@ public class RoleController extends BaseController {
 		return model;
 	}
 
+	/**
+	 * 查询角色的菜单树结构数据
+	 * @param roleCode
+	 * @param sysCode
+	 */
+	@RequiresPermissions("sys:role:view")
+	@RequestMapping(value = "menuTreeDataByRoleCode")
+	@ResponseBody
+	public List<Map<String, Object>> menuTreeDataByRoleCode(String roleCode, String sysCode) {
+		List<Map<String, Object>> mapList = ListUtils.newArrayList();
+		if (StringUtils.isBlank(roleCode)) {
+			return mapList;
+		}
+		Menu menuWhere = new Menu();
+		menuWhere.setRoleCode(roleCode);
+		menuWhere.setSysCode(sysCode);
+		menuWhere.setHasDataScope(true);
+		List<Menu> list = menuService.findByRoleCode(menuWhere);
+		for (Menu menu : list){
+			Map<String, Object> m = MapUtils.newHashMap();
+			m.put("id", menu.getId());
+			m.put("pId", menu.getParentCode());
+			m.put("name", menu.getMenuName() + "<font color=#888> &nbsp; &nbsp; "
+					+ ObjectUtils.toString(menu.getPermission()) + "</font>");
+			m.put("title", menu.getMenuName() + "&nbsp;"
+					+ ObjectUtils.toString(menu.getPermission()));
+			m.put("rawName", menu.getMenuName());
+			m.put("isParent", !menu.getIsTreeLeaf());
+			m.put("permission", menu.getPermission());
+			m.put("hasDataScope", menu.getHasDataScope());
+			mapList.add(m);
+		}
+		return mapList;
+	}
+
 	/** 
 	 * 角色授权数据权限
 	 */
 	@RequiresPermissions("sys:role:edit")
 	@RequestMapping(value = "formAuthDataScope")
-	public String formAuthDataScope(Role role, String checkbox, Model model, HttpServletRequest request) {
+	public String formAuthDataScope(Role role, Model model, HttpServletRequest request) {
+		// 拥有的角色数据权限
 		RoleDataScope roleDataScope = new RoleDataScope();
 		roleDataScope.setRoleCode(role.getRoleCode());
 		List<RoleDataScope> roleDataScopeList = roleService.findDataScopeList(roleDataScope);
 		model.addAttribute("roleDataScopeList", roleDataScopeList);
+		// 拥有的菜单数据权限
+		MenuDataScope menuDataScope = new MenuDataScope();
+		menuDataScope.setRoleCode(role.getRoleCode());
+		List<MenuDataScope> menuDataScopeList = roleService.findMenuDataScopeList(menuDataScope);
+		model.addAttribute("menuDataScopeList", menuDataScopeList);
+		// 设置其它对象
 		model.addAttribute("role", role);
 		model.addAttribute("moduleCodes", ModuleUtils.getEnableModuleCodes());
 		model.addAttribute("dataScopes", JsonMapper.fromJson(Global.getConfig("user.dataScopes", "[]"), List.class));

modules/core/src/main/resources/db/create/db2/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE ${_prefix}biz_category
+(
+	category_code varchar(64) NOT NULL,
+	view_code varchar(500),
+	category_name varchar(64) NOT NULL,
+	parent_code varchar(64) NOT NULL,
+	parent_codes varchar(767) NOT NULL,
+	tree_sort decimal(10) NOT NULL,
+	tree_sorts varchar(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level decimal(4) NOT NULL,
+	tree_names varchar(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date timestamp NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date timestamp NOT NULL,
+	remarks vargraphic(500),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+);
+
+
 -- 代码生成表
 CREATE TABLE ${_prefix}gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE ${_prefix}sys_area
 );
 
 
--- 业务分类
-CREATE TABLE ${_prefix}biz_category
-(
-	category_code varchar(64) NOT NULL,
-	view_code varchar(500),
-	category_name varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks vargraphic(500),
-	corp_code varchar(64) DEFAULT '0' NOT NULL,
-	corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-);
-
-
 -- 公司表
 CREATE TABLE ${_prefix}sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE ${_prefix}sys_menu
 );
 
 
+-- 菜单数据权限
+CREATE TABLE ${_prefix}sys_menu_data_scope
+(
+	id varchar(64) NOT NULL,
+	role_code varchar(64) NOT NULL,
+	menu_code varchar(64) NOT NULL,
+	rule_name varchar(100),
+	rule_type char(1),
+	rule_config clob,
+	status char(1),
+	remarks vargraphic(500),
+	PRIMARY KEY (id)
+);
+
+
 -- 模块表
 CREATE TABLE ${_prefix}sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE ${_prefix}sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL,
 	ctrl_data varchar(64) NOT NULL,
 	ctrl_permi varchar(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON ${_prefix}sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON ${_prefix}sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON ${_prefix}sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON ${_prefix}sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON ${_prefix}sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON ${_prefix}sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON ${_prefix}sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON ${_prefix}sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON ${_prefix}sys_msg_inner (status);

modules/core/src/main/resources/db/create/h2/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE ${_prefix}biz_category
+(
+	category_code varchar(64) NOT NULL,
+	view_code varchar(500),
+	category_name varchar(64) NOT NULL,
+	parent_code varchar(64) NOT NULL,
+	parent_codes varchar(767) NOT NULL,
+	tree_sort decimal(10) NOT NULL,
+	tree_sorts varchar(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level decimal(4) NOT NULL,
+	tree_names varchar(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date datetime NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date datetime NOT NULL,
+	remarks varchar(500),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+);
+
+
 -- 代码生成表
 CREATE TABLE ${_prefix}gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE ${_prefix}sys_area
 );
 
 
--- 业务分类
-CREATE TABLE ${_prefix}biz_category
-(
-	category_code varchar(64) NOT NULL,
-	view_code varchar(500),
-	category_name varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	corp_code varchar(64) DEFAULT '0' NOT NULL,
-	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-);
-
-
 -- 公司表
 CREATE TABLE ${_prefix}sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE ${_prefix}sys_menu
 );
 
 
+-- 菜单数据权限
+CREATE TABLE ${_prefix}sys_menu_data_scope
+(
+	id varchar(64) NOT NULL,
+	role_code varchar(64) NOT NULL,
+	menu_code varchar(64) NOT NULL,
+	rule_name varchar(100),
+	rule_type char(1),
+	rule_config clob,
+	status char(1),
+	remarks varchar(500),
+	PRIMARY KEY (id)
+);
+
+
 -- 模块表
 CREATE TABLE ${_prefix}sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE ${_prefix}sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL,
 	ctrl_data varchar(64) NOT NULL,
 	ctrl_permi varchar(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON ${_prefix}sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON ${_prefix}sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON ${_prefix}sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON ${_prefix}sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON ${_prefix}sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON ${_prefix}sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON ${_prefix}sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON ${_prefix}sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON ${_prefix}sys_msg_inner (status);
@@ -999,6 +1017,25 @@ CREATE INDEX idx_sys_user_cc ON ${_prefix}sys_user (corp_code);
 
 /* Comments */
 
+COMMENT ON TABLE ${_prefix}biz_category IS '业务分类';
+COMMENT ON COLUMN ${_prefix}biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN ${_prefix}biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN ${_prefix}biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN ${_prefix}biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN ${_prefix}biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN ${_prefix}biz_category.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN ${_prefix}biz_category.create_by IS '创建者';
+COMMENT ON COLUMN ${_prefix}biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN ${_prefix}biz_category.update_by IS '更新者';
+COMMENT ON COLUMN ${_prefix}biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN ${_prefix}biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN ${_prefix}biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN ${_prefix}biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE ${_prefix}gen_table IS '代码生成表';
 COMMENT ON COLUMN ${_prefix}gen_table.table_name IS '表名';
 COMMENT ON COLUMN ${_prefix}gen_table.class_name IS '实体类名称';
@@ -1058,25 +1095,6 @@ COMMENT ON COLUMN ${_prefix}sys_area.create_date IS '创建时间';
 COMMENT ON COLUMN ${_prefix}sys_area.update_by IS '更新者';
 COMMENT ON COLUMN ${_prefix}sys_area.update_date IS '更新时间';
 COMMENT ON COLUMN ${_prefix}sys_area.remarks IS '备注信息';
-COMMENT ON TABLE ${_prefix}biz_category IS '业务分类';
-COMMENT ON COLUMN ${_prefix}biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN ${_prefix}biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN ${_prefix}biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN ${_prefix}biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN ${_prefix}biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN ${_prefix}biz_category.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN ${_prefix}biz_category.create_by IS '创建者';
-COMMENT ON COLUMN ${_prefix}biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN ${_prefix}biz_category.update_by IS '更新者';
-COMMENT ON COLUMN ${_prefix}biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN ${_prefix}biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN ${_prefix}biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN ${_prefix}biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE ${_prefix}sys_company IS '公司表';
 COMMENT ON COLUMN ${_prefix}sys_company.company_code IS '公司编码';
 COMMENT ON COLUMN ${_prefix}sys_company.view_code IS '公司代码';
@@ -1375,6 +1393,15 @@ COMMENT ON COLUMN ${_prefix}sys_menu.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_d4 IS '扩展 Date 4';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_json IS '扩展 JSON';
+COMMENT ON TABLE ${_prefix}sys_menu_data_scope IS '菜单数据权限';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.id IS '编号';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.role_code IS '角色编码';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.menu_code IS '菜单编码';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_name IS '规则名称';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_type IS '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_config IS '规则配置（JSON）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.remarks IS '备注信息';
 COMMENT ON TABLE ${_prefix}sys_module IS '模块表';
 COMMENT ON COLUMN ${_prefix}sys_module.module_code IS '模块编码';
 COMMENT ON COLUMN ${_prefix}sys_module.module_name IS '模块名称';
@@ -1551,7 +1578,7 @@ COMMENT ON COLUMN ${_prefix}sys_role.is_sys IS '系统内置（1是 0否）';
 COMMENT ON COLUMN ${_prefix}sys_role.is_show IS '是否显示';
 COMMENT ON COLUMN ${_prefix}sys_role.user_type IS '用户类型（employee员工 member会员）';
 COMMENT ON COLUMN ${_prefix}sys_role.desktop_url IS '桌面地址（仪表盘地址）';
-COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围设置（0未设置  1全部数据 2自定义数据）';
+COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围（0未设置 1全部数据 2自定义数据）';
 COMMENT ON COLUMN ${_prefix}sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
 COMMENT ON COLUMN ${_prefix}sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
 COMMENT ON COLUMN ${_prefix}sys_role.status IS '状态（0正常 1删除 2停用）';
@@ -1588,6 +1615,7 @@ COMMENT ON COLUMN ${_prefix}sys_role_data_scope.role_code IS '控制角色编码
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_type IS '控制类型';
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_data IS '控制数据';
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_permi IS '控制权限';
+COMMENT ON COLUMN ${_prefix}sys_role_data_scope.menu_code IS '菜单编码';
 COMMENT ON TABLE ${_prefix}sys_role_menu IS '角色与菜单关联表';
 COMMENT ON COLUMN ${_prefix}sys_role_menu.role_code IS '角色编码';
 COMMENT ON COLUMN ${_prefix}sys_role_menu.menu_code IS '菜单编码';

modules/core/src/main/resources/db/create/mssql/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE [${_prefix}biz_category]
+(
+	[category_code] varchar(64) NOT NULL,
+	[view_code] varchar(500),
+	[category_name] varchar(64) NOT NULL,
+	[parent_code] varchar(64) NOT NULL,
+	[parent_codes] varchar(767) NOT NULL,
+	[tree_sort] decimal(10) NOT NULL,
+	[tree_sorts] varchar(767) NOT NULL,
+	[tree_leaf] char(1) NOT NULL,
+	[tree_level] decimal(4) NOT NULL,
+	[tree_names] varchar(767) NOT NULL,
+	[status] char(1) DEFAULT '0' NOT NULL,
+	[create_by] varchar(64) NOT NULL,
+	[create_date] datetime NOT NULL,
+	[update_by] varchar(64) NOT NULL,
+	[update_date] datetime NOT NULL,
+	[remarks] nvarchar(500),
+	[corp_code] varchar(64) DEFAULT '0' NOT NULL,
+	[corp_name] nvarchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY ([category_code])
+);
+
+
 -- 代码生成表
 CREATE TABLE [${_prefix}gen_table]
 (
@@ -79,31 +104,6 @@ CREATE TABLE [${_prefix}sys_area]
 );
 
 
--- 业务分类
-CREATE TABLE [${_prefix}biz_category]
-(
-	[category_code] varchar(64) NOT NULL,
-	[view_code] varchar(500),
-	[category_name] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	[corp_code] varchar(64) DEFAULT '0' NOT NULL,
-	[corp_name] nvarchar(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY ([category_code])
-);
-
-
 -- 公司表
 CREATE TABLE [${_prefix}sys_company]
 (
@@ -492,6 +492,21 @@ CREATE TABLE [${_prefix}sys_menu]
 );
 
 
+-- 菜单数据权限
+CREATE TABLE [${_prefix}sys_menu_data_scope]
+(
+	[id] varchar(64) NOT NULL,
+	[role_code] varchar(64) NOT NULL,
+	[menu_code] varchar(64) NOT NULL,
+	[rule_name] varchar(100),
+	[rule_type] char(1),
+	[rule_config] text,
+	[status] char(1),
+	[remarks] nvarchar(500),
+	PRIMARY KEY ([id])
+);
+
+
 -- 模块表
 CREATE TABLE [${_prefix}sys_module]
 (
@@ -767,7 +782,8 @@ CREATE TABLE [${_prefix}sys_role_data_scope]
 	[ctrl_type] varchar(20) NOT NULL,
 	[ctrl_data] varchar(64) NOT NULL,
 	[ctrl_permi] varchar(64) NOT NULL,
-	PRIMARY KEY ([role_code], [ctrl_type], [ctrl_data], [ctrl_permi])
+	[menu_code] varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY ([role_code], [ctrl_type], [ctrl_data], [ctrl_permi], [menu_code])
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX [idx_sys_menu_sc] ON [${_prefix}sys_menu] ([sys_code]);
 CREATE INDEX [idx_sys_menu_is] ON [${_prefix}sys_menu] ([is_show]);
 CREATE INDEX [idx_sys_menu_mcs] ON [${_prefix}sys_menu] ([module_codes]);
 CREATE INDEX [idx_sys_menu_wt] ON [${_prefix}sys_menu] ([weight]);
+CREATE INDEX [idx_sys_menu_ds_mc] ON [${_prefix}sys_menu_data_scope] ([menu_code]);
+CREATE INDEX [idx_sys_menu_ds_rc] ON [${_prefix}sys_menu_data_scope] ([role_code]);
 CREATE INDEX [idx_sys_module_status] ON [${_prefix}sys_module] ([status]);
 CREATE INDEX [idx_sys_msg_inner_cb] ON [${_prefix}sys_msg_inner] ([create_by]);
 CREATE INDEX [idx_sys_msg_inner_status] ON [${_prefix}sys_msg_inner] ([status]);

modules/core/src/main/resources/db/create/mysql/core.sql

@@ -3,6 +3,31 @@ SET SESSION FOREIGN_KEY_CHECKS=0;
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE ${_prefix}biz_category
+(
+	category_code varchar(64) NOT NULL COMMENT '流程分类',
+	view_code varchar(500) COMMENT '分类代码',
+	category_name varchar(64) NOT NULL COMMENT '分类名称',
+	parent_code varchar(64) NOT NULL COMMENT '父级编号',
+	parent_codes varchar(767) NOT NULL COMMENT '所有父级编号',
+	tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
+	tree_sorts varchar(767) NOT NULL COMMENT '所有排序号',
+	tree_leaf char(1) NOT NULL COMMENT '是否最末级',
+	tree_level decimal(4) NOT NULL COMMENT '层次级别',
+	tree_names varchar(767) NOT NULL COMMENT '全节点名',
+	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
+	create_by varchar(64) NOT NULL COMMENT '创建者',
+	create_date datetime NOT NULL COMMENT '创建时间',
+	update_by varchar(64) NOT NULL COMMENT '更新者',
+	update_date datetime NOT NULL COMMENT '更新时间',
+	remarks varchar(500) COMMENT '备注信息',
+	corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码',
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称',
+	PRIMARY KEY (category_code)
+) COMMENT = '业务分类';
+
+
 -- 代码生成表
 CREATE TABLE ${_prefix}gen_table
 (
@@ -80,31 +105,6 @@ CREATE TABLE ${_prefix}sys_area
 ) COMMENT = '行政区划';
 
 
--- 业务分类
-CREATE TABLE ${_prefix}biz_category
-(
-	category_code varchar(64) NOT NULL COMMENT '流程分类',
-	view_code varchar(500) COMMENT '分类代码',
-	category_name varchar(64) NOT NULL COMMENT '分类名称',
-	parent_code varchar(64) NOT NULL COMMENT '父级编号',
-	parent_codes varchar(767) NOT NULL COMMENT '所有父级编号',
-	tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
-	tree_sorts varchar(767) NOT NULL COMMENT '所有排序号',
-	tree_leaf char(1) NOT NULL COMMENT '是否最末级',
-	tree_level decimal(4) NOT NULL COMMENT '层次级别',
-	tree_names varchar(767) NOT NULL COMMENT '全节点名',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
-	create_by varchar(64) NOT NULL COMMENT '创建者',
-	create_date datetime NOT NULL COMMENT '创建时间',
-	update_by varchar(64) NOT NULL COMMENT '更新者',
-	update_date datetime NOT NULL COMMENT '更新时间',
-	remarks varchar(500) COMMENT '备注信息',
-	corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码',
-	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称',
-	PRIMARY KEY (category_code)
-) COMMENT = '业务分类';
-
-
 -- 公司表
 CREATE TABLE ${_prefix}sys_company
 (
@@ -493,6 +493,21 @@ CREATE TABLE ${_prefix}sys_menu
 ) COMMENT = '菜单表';
 
 
+-- 菜单数据权限
+CREATE TABLE ${_prefix}sys_menu_data_scope
+(
+	id varchar(64) NOT NULL COMMENT '编号',
+	role_code varchar(64) NOT NULL COMMENT '角色编码',
+	menu_code varchar(64) NOT NULL COMMENT '菜单编码',
+	rule_name varchar(100) COMMENT '规则名称',
+	rule_type char(1) COMMENT '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）',
+	rule_config text COMMENT '规则配置（JSON）',
+	status char(1) COMMENT '状态（0正常 1删除 2停用）',
+	remarks varchar(500) COMMENT '备注信息',
+	PRIMARY KEY (id)
+) COMMENT = '菜单数据权限';
+
+
 -- 模块表
 CREATE TABLE ${_prefix}sys_module
 (
@@ -725,7 +740,7 @@ CREATE TABLE ${_prefix}sys_role
 	is_show char(1) DEFAULT '1' COMMENT '是否显示',
 	user_type varchar(16) COMMENT '用户类型（employee员工 member会员）',
 	desktop_url varchar(255) COMMENT '桌面地址（仪表盘地址）',
-	data_scope char(1) COMMENT '数据范围设置（0未设置  1全部数据 2自定义数据）',
+	data_scope char(1) COMMENT '数据范围（0未设置 1全部数据 2自定义数据）',
 	biz_scope varchar(255) COMMENT '适应业务范围（不同的功能，不同的数据权限支持）',
 	sys_codes varchar(500) COMMENT '包含系统（多个用逗号隔开）',
 	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
@@ -768,7 +783,8 @@ CREATE TABLE ${_prefix}sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL COMMENT '控制类型',
 	ctrl_data varchar(64) NOT NULL COMMENT '控制数据',
 	ctrl_permi varchar(64) NOT NULL COMMENT '控制权限',
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL COMMENT '菜单编码',
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 ) COMMENT = '角色数据权限表';
 
 
@@ -935,6 +951,8 @@ CREATE INDEX idx_sys_menu_sc ON ${_prefix}sys_menu (sys_code ASC);
 CREATE INDEX idx_sys_menu_is ON ${_prefix}sys_menu (is_show ASC);
 CREATE INDEX idx_sys_menu_mcs ON ${_prefix}sys_menu (module_codes ASC);
 CREATE INDEX idx_sys_menu_wt ON ${_prefix}sys_menu (weight ASC);
+CREATE INDEX idx_sys_menu_ds_mc ON ${_prefix}sys_menu_data_scope (menu_code ASC);
+CREATE INDEX idx_sys_menu_ds_rc ON ${_prefix}sys_menu_data_scope (role_code ASC);
 CREATE INDEX idx_sys_module_status ON ${_prefix}sys_module (status ASC);
 CREATE INDEX idx_sys_msg_inner_cb ON ${_prefix}sys_msg_inner (create_by ASC);
 CREATE INDEX idx_sys_msg_inner_status ON ${_prefix}sys_msg_inner (status ASC);

modules/core/src/main/resources/db/create/oracle/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE ${_prefix}biz_category
+(
+	category_code varchar2(64) NOT NULL,
+	view_code varchar2(500),
+	category_name varchar2(64) NOT NULL,
+	parent_code varchar2(64) NOT NULL,
+	parent_codes varchar2(767) NOT NULL,
+	tree_sort number(10) NOT NULL,
+	tree_sorts varchar2(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level number(4) NOT NULL,
+	tree_names varchar2(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar2(64) NOT NULL,
+	create_date timestamp NOT NULL,
+	update_by varchar2(64) NOT NULL,
+	update_date timestamp NOT NULL,
+	remarks nvarchar2(500),
+	corp_code varchar2(64) DEFAULT '0' NOT NULL,
+	corp_name nvarchar2(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+);
+
+
 -- 代码生成表
 CREATE TABLE ${_prefix}gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE ${_prefix}sys_area
 );
 
 
--- 业务分类
-CREATE TABLE ${_prefix}biz_category
-(
-	category_code varchar2(64) NOT NULL,
-	view_code varchar2(500),
-	category_name varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	corp_code varchar2(64) DEFAULT '0' NOT NULL,
-	corp_name nvarchar2(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-);
-
-
 -- 公司表
 CREATE TABLE ${_prefix}sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE ${_prefix}sys_menu
 );
 
 
+-- 菜单数据权限
+CREATE TABLE ${_prefix}sys_menu_data_scope
+(
+	id varchar2(64) NOT NULL,
+	role_code varchar2(64) NOT NULL,
+	menu_code varchar2(64) NOT NULL,
+	rule_name varchar2(100),
+	rule_type char(1),
+	rule_config clob,
+	status char(1),
+	remarks nvarchar2(500),
+	PRIMARY KEY (id)
+);
+
+
 -- 模块表
 CREATE TABLE ${_prefix}sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE ${_prefix}sys_role_data_scope
 	ctrl_type varchar2(20) NOT NULL,
 	ctrl_data varchar2(64) NOT NULL,
 	ctrl_permi varchar2(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar2(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 );
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON ${_prefix}sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON ${_prefix}sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON ${_prefix}sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON ${_prefix}sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON ${_prefix}sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON ${_prefix}sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON ${_prefix}sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON ${_prefix}sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON ${_prefix}sys_msg_inner (status);
@@ -999,6 +1017,25 @@ CREATE INDEX idx_sys_user_cc ON ${_prefix}sys_user (corp_code);
 
 /* Comments */
 
+COMMENT ON TABLE ${_prefix}biz_category IS '业务分类';
+COMMENT ON COLUMN ${_prefix}biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN ${_prefix}biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN ${_prefix}biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN ${_prefix}biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN ${_prefix}biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN ${_prefix}biz_category.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN ${_prefix}biz_category.create_by IS '创建者';
+COMMENT ON COLUMN ${_prefix}biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN ${_prefix}biz_category.update_by IS '更新者';
+COMMENT ON COLUMN ${_prefix}biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN ${_prefix}biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN ${_prefix}biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN ${_prefix}biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE ${_prefix}gen_table IS '代码生成表';
 COMMENT ON COLUMN ${_prefix}gen_table.table_name IS '表名';
 COMMENT ON COLUMN ${_prefix}gen_table.class_name IS '实体类名称';
@@ -1058,25 +1095,6 @@ COMMENT ON COLUMN ${_prefix}sys_area.create_date IS '创建时间';
 COMMENT ON COLUMN ${_prefix}sys_area.update_by IS '更新者';
 COMMENT ON COLUMN ${_prefix}sys_area.update_date IS '更新时间';
 COMMENT ON COLUMN ${_prefix}sys_area.remarks IS '备注信息';
-COMMENT ON TABLE ${_prefix}biz_category IS '业务分类';
-COMMENT ON COLUMN ${_prefix}biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN ${_prefix}biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN ${_prefix}biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN ${_prefix}biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN ${_prefix}biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN ${_prefix}biz_category.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN ${_prefix}biz_category.create_by IS '创建者';
-COMMENT ON COLUMN ${_prefix}biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN ${_prefix}biz_category.update_by IS '更新者';
-COMMENT ON COLUMN ${_prefix}biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN ${_prefix}biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN ${_prefix}biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN ${_prefix}biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE ${_prefix}sys_company IS '公司表';
 COMMENT ON COLUMN ${_prefix}sys_company.company_code IS '公司编码';
 COMMENT ON COLUMN ${_prefix}sys_company.view_code IS '公司代码';
@@ -1375,6 +1393,15 @@ COMMENT ON COLUMN ${_prefix}sys_menu.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_d4 IS '扩展 Date 4';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_json IS '扩展 JSON';
+COMMENT ON TABLE ${_prefix}sys_menu_data_scope IS '菜单数据权限';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.id IS '编号';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.role_code IS '角色编码';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.menu_code IS '菜单编码';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_name IS '规则名称';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_type IS '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_config IS '规则配置（JSON）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.remarks IS '备注信息';
 COMMENT ON TABLE ${_prefix}sys_module IS '模块表';
 COMMENT ON COLUMN ${_prefix}sys_module.module_code IS '模块编码';
 COMMENT ON COLUMN ${_prefix}sys_module.module_name IS '模块名称';
@@ -1551,7 +1578,7 @@ COMMENT ON COLUMN ${_prefix}sys_role.is_sys IS '系统内置（1是 0否）';
 COMMENT ON COLUMN ${_prefix}sys_role.is_show IS '是否显示';
 COMMENT ON COLUMN ${_prefix}sys_role.user_type IS '用户类型（employee员工 member会员）';
 COMMENT ON COLUMN ${_prefix}sys_role.desktop_url IS '桌面地址（仪表盘地址）';
-COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围设置（0未设置  1全部数据 2自定义数据）';
+COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围（0未设置 1全部数据 2自定义数据）';
 COMMENT ON COLUMN ${_prefix}sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
 COMMENT ON COLUMN ${_prefix}sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
 COMMENT ON COLUMN ${_prefix}sys_role.status IS '状态（0正常 1删除 2停用）';
@@ -1588,6 +1615,7 @@ COMMENT ON COLUMN ${_prefix}sys_role_data_scope.role_code IS '控制角色编码
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_type IS '控制类型';
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_data IS '控制数据';
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_permi IS '控制权限';
+COMMENT ON COLUMN ${_prefix}sys_role_data_scope.menu_code IS '菜单编码';
 COMMENT ON TABLE ${_prefix}sys_role_menu IS '角色与菜单关联表';
 COMMENT ON COLUMN ${_prefix}sys_role_menu.role_code IS '角色编码';
 COMMENT ON COLUMN ${_prefix}sys_role_menu.menu_code IS '菜单编码';

modules/core/src/main/resources/db/create/postgresql/core.sql

@@ -2,6 +2,31 @@
 
 /* Create Tables */
 
+-- 业务分类
+CREATE TABLE ${_prefix}biz_category
+(
+	category_code varchar(64) NOT NULL,
+	view_code varchar(500),
+	category_name varchar(64) NOT NULL,
+	parent_code varchar(64) NOT NULL,
+	parent_codes varchar(767) NOT NULL,
+	tree_sort decimal(10) NOT NULL,
+	tree_sorts varchar(767) NOT NULL,
+	tree_leaf char(1) NOT NULL,
+	tree_level decimal(4) NOT NULL,
+	tree_names varchar(767) NOT NULL,
+	status char(1) DEFAULT '0' NOT NULL,
+	create_by varchar(64) NOT NULL,
+	create_date timestamp NOT NULL,
+	update_by varchar(64) NOT NULL,
+	update_date timestamp NOT NULL,
+	remarks varchar(500),
+	corp_code varchar(64) DEFAULT '0' NOT NULL,
+	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
+	PRIMARY KEY (category_code)
+) WITHOUT OIDS;
+
+
 -- 代码生成表
 CREATE TABLE ${_prefix}gen_table
 (
@@ -79,31 +104,6 @@ CREATE TABLE ${_prefix}sys_area
 ) WITHOUT OIDS;
 
 
--- 业务分类
-CREATE TABLE ${_prefix}biz_category
-(
-	category_code varchar(64) NOT NULL,
-	view_code varchar(500),
-	category_name varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	corp_code varchar(64) DEFAULT '0' NOT NULL,
-	corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL,
-	PRIMARY KEY (category_code)
-) WITHOUT OIDS;
-
-
 -- 公司表
 CREATE TABLE ${_prefix}sys_company
 (
@@ -492,6 +492,21 @@ CREATE TABLE ${_prefix}sys_menu
 ) WITHOUT OIDS;
 
 
+-- 菜单数据权限
+CREATE TABLE ${_prefix}sys_menu_data_scope
+(
+	id varchar(64) NOT NULL,
+	role_code varchar(64) NOT NULL,
+	menu_code varchar(64) NOT NULL,
+	rule_name varchar(100),
+	rule_type char(1),
+	rule_config text,
+	status char(1),
+	remarks varchar(500),
+	PRIMARY KEY (id)
+) WITHOUT OIDS;
+
+
 -- 模块表
 CREATE TABLE ${_prefix}sys_module
 (
@@ -767,7 +782,8 @@ CREATE TABLE ${_prefix}sys_role_data_scope
 	ctrl_type varchar(20) NOT NULL,
 	ctrl_data varchar(64) NOT NULL,
 	ctrl_permi varchar(64) NOT NULL,
-	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi)
+	menu_code varchar(64) DEFAULT '0' NOT NULL,
+	PRIMARY KEY (role_code, ctrl_type, ctrl_data, ctrl_permi, menu_code)
 ) WITHOUT OIDS;
 
 
@@ -934,6 +950,8 @@ CREATE INDEX idx_sys_menu_sc ON ${_prefix}sys_menu (sys_code);
 CREATE INDEX idx_sys_menu_is ON ${_prefix}sys_menu (is_show);
 CREATE INDEX idx_sys_menu_mcs ON ${_prefix}sys_menu (module_codes);
 CREATE INDEX idx_sys_menu_wt ON ${_prefix}sys_menu (weight);
+CREATE INDEX idx_sys_menu_ds_mc ON ${_prefix}sys_menu_data_scope (menu_code);
+CREATE INDEX idx_sys_menu_ds_rc ON ${_prefix}sys_menu_data_scope (role_code);
 CREATE INDEX idx_sys_module_status ON ${_prefix}sys_module (status);
 CREATE INDEX idx_sys_msg_inner_cb ON ${_prefix}sys_msg_inner (create_by);
 CREATE INDEX idx_sys_msg_inner_status ON ${_prefix}sys_msg_inner (status);
@@ -999,6 +1017,25 @@ CREATE INDEX idx_sys_user_cc ON ${_prefix}sys_user (corp_code);
 
 /* Comments */
 
+COMMENT ON TABLE ${_prefix}biz_category IS '业务分类';
+COMMENT ON COLUMN ${_prefix}biz_category.category_code IS '流程分类';
+COMMENT ON COLUMN ${_prefix}biz_category.view_code IS '分类代码';
+COMMENT ON COLUMN ${_prefix}biz_category.category_name IS '分类名称';
+COMMENT ON COLUMN ${_prefix}biz_category.parent_code IS '父级编号';
+COMMENT ON COLUMN ${_prefix}biz_category.parent_codes IS '所有父级编号';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_sort IS '排序号（升序）';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_sorts IS '所有排序号';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_leaf IS '是否最末级';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_level IS '层次级别';
+COMMENT ON COLUMN ${_prefix}biz_category.tree_names IS '全节点名';
+COMMENT ON COLUMN ${_prefix}biz_category.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN ${_prefix}biz_category.create_by IS '创建者';
+COMMENT ON COLUMN ${_prefix}biz_category.create_date IS '创建时间';
+COMMENT ON COLUMN ${_prefix}biz_category.update_by IS '更新者';
+COMMENT ON COLUMN ${_prefix}biz_category.update_date IS '更新时间';
+COMMENT ON COLUMN ${_prefix}biz_category.remarks IS '备注信息';
+COMMENT ON COLUMN ${_prefix}biz_category.corp_code IS '租户代码';
+COMMENT ON COLUMN ${_prefix}biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE ${_prefix}gen_table IS '代码生成表';
 COMMENT ON COLUMN ${_prefix}gen_table.table_name IS '表名';
 COMMENT ON COLUMN ${_prefix}gen_table.class_name IS '实体类名称';
@@ -1058,25 +1095,6 @@ COMMENT ON COLUMN ${_prefix}sys_area.create_date IS '创建时间';
 COMMENT ON COLUMN ${_prefix}sys_area.update_by IS '更新者';
 COMMENT ON COLUMN ${_prefix}sys_area.update_date IS '更新时间';
 COMMENT ON COLUMN ${_prefix}sys_area.remarks IS '备注信息';
-COMMENT ON TABLE ${_prefix}biz_category IS '业务分类';
-COMMENT ON COLUMN ${_prefix}biz_category.category_code IS '流程分类';
-COMMENT ON COLUMN ${_prefix}biz_category.view_code IS '分类代码';
-COMMENT ON COLUMN ${_prefix}biz_category.category_name IS '分类名称';
-COMMENT ON COLUMN ${_prefix}biz_category.parent_code IS '父级编号';
-COMMENT ON COLUMN ${_prefix}biz_category.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_level IS '层次级别';
-COMMENT ON COLUMN ${_prefix}biz_category.tree_names IS '全节点名';
-COMMENT ON COLUMN ${_prefix}biz_category.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN ${_prefix}biz_category.create_by IS '创建者';
-COMMENT ON COLUMN ${_prefix}biz_category.create_date IS '创建时间';
-COMMENT ON COLUMN ${_prefix}biz_category.update_by IS '更新者';
-COMMENT ON COLUMN ${_prefix}biz_category.update_date IS '更新时间';
-COMMENT ON COLUMN ${_prefix}biz_category.remarks IS '备注信息';
-COMMENT ON COLUMN ${_prefix}biz_category.corp_code IS '租户代码';
-COMMENT ON COLUMN ${_prefix}biz_category.corp_name IS '租户名称';
 COMMENT ON TABLE ${_prefix}sys_company IS '公司表';
 COMMENT ON COLUMN ${_prefix}sys_company.company_code IS '公司编码';
 COMMENT ON COLUMN ${_prefix}sys_company.view_code IS '公司代码';
@@ -1375,6 +1393,15 @@ COMMENT ON COLUMN ${_prefix}sys_menu.extend_d2 IS '扩展 Date 2';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_d3 IS '扩展 Date 3';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_d4 IS '扩展 Date 4';
 COMMENT ON COLUMN ${_prefix}sys_menu.extend_json IS '扩展 JSON';
+COMMENT ON TABLE ${_prefix}sys_menu_data_scope IS '菜单数据权限';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.id IS '编号';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.role_code IS '角色编码';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.menu_code IS '菜单编码';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_name IS '规则名称';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_type IS '规则类型（1 角色数据范围 2自定义条件规则 3自定义SQL）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.rule_config IS '规则配置（JSON）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.status IS '状态（0正常 1删除 2停用）';
+COMMENT ON COLUMN ${_prefix}sys_menu_data_scope.remarks IS '备注信息';
 COMMENT ON TABLE ${_prefix}sys_module IS '模块表';
 COMMENT ON COLUMN ${_prefix}sys_module.module_code IS '模块编码';
 COMMENT ON COLUMN ${_prefix}sys_module.module_name IS '模块名称';
@@ -1551,7 +1578,7 @@ COMMENT ON COLUMN ${_prefix}sys_role.is_sys IS '系统内置（1是 0否）';
 COMMENT ON COLUMN ${_prefix}sys_role.is_show IS '是否显示';
 COMMENT ON COLUMN ${_prefix}sys_role.user_type IS '用户类型（employee员工 member会员）';
 COMMENT ON COLUMN ${_prefix}sys_role.desktop_url IS '桌面地址（仪表盘地址）';
-COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围设置（0未设置  1全部数据 2自定义数据）';
+COMMENT ON COLUMN ${_prefix}sys_role.data_scope IS '数据范围（0未设置 1全部数据 2自定义数据）';
 COMMENT ON COLUMN ${_prefix}sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）';
 COMMENT ON COLUMN ${_prefix}sys_role.sys_codes IS '包含系统（多个用逗号隔开）';
 COMMENT ON COLUMN ${_prefix}sys_role.status IS '状态（0正常 1删除 2停用）';
@@ -1588,6 +1615,7 @@ COMMENT ON COLUMN ${_prefix}sys_role_data_scope.role_code IS '控制角色编码
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_type IS '控制类型';
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_data IS '控制数据';
 COMMENT ON COLUMN ${_prefix}sys_role_data_scope.ctrl_permi IS '控制权限';
+COMMENT ON COLUMN ${_prefix}sys_role_data_scope.menu_code IS '菜单编码';
 COMMENT ON TABLE ${_prefix}sys_role_menu IS '角色与菜单关联表';
 COMMENT ON COLUMN ${_prefix}sys_role_menu.role_code IS '角色编码';
 COMMENT ON COLUMN ${_prefix}sys_role_menu.menu_code IS '菜单编码';