diff --git a/common/src/main/java/com/jeesite/common/lang/TimeUtils.java b/common/src/main/java/com/jeesite/common/lang/TimeUtils.java index 06d3ea6e..e93addbe 100644 --- a/common/src/main/java/com/jeesite/common/lang/TimeUtils.java +++ b/common/src/main/java/com/jeesite/common/lang/TimeUtils.java @@ -26,7 +26,7 @@ public class TimeUtils { long minute = (ms - day * dd - hour * hh) / mi; long second = (ms - day * dd - hour * hh - minute * mi) / ss; StringBuilder sb = new StringBuilder(); - if (ms < 1000) { + if (ms >= 0 && ms < 1000) { sb.append(ms).append("毫秒"); } else { if (day > 0) { diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index e675c3a2..5373a536 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 1344 - 480 + 1524 + 31 128 128 @@ -2279,6 +2279,22 @@ menu_target varchar(n) + + e6d37962edd3a1eefde9a3795406fdd36887f1ac + 100 + null + false + null + false + false + false + + false + + 菜单标题 + menu_title + varchar(n) + f22f8e8ec4f9a9edfc3a04de5c62d4cb485a0f82 1 @@ -4995,566 +5011,6 @@ - - a1303ae2ba44af053708a3742aee02836c407c3d - 1218 - 617 - Segoe UI - 9 - 2280 - 36 - - 128 - 128 - 192 - - - - js_sys_menu - 菜单表 - - - - - - - adba31cfd94479f79feda2a3b90cc1bac3eed99f - e84c40cdf5ffdb2ba4d59630d98abb5972d74795 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - a535b6c506004a7fdf4d48984c9ff2cfa59c157a - - d5a4d04f60ce748f15b651a78cef47d1a14e19fa - 4a02b55091ae2d39146d66ec12708a3121efc3bc - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f22f8e8ec4f9a9edfc3a04de5c62d4cb485a0f82 - c1a08754015d02b0489f0432d1a4f13db0384b71 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 61ecd8a2f562b6c7540d73935c5ab7672d3f3bfc - 854fc4de71470d2d019c5c2a0dd235e163bef43e - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - bcf07d65d41b82a0a96dc5da4faa8d4a2c52e3e9 - 95e937df6fffbcf8bedce5154965f2c8e7e1acd5 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1e3adac597a8668830a11c2652cc6adb661d941a - 8f4fdd0a58a54d8205bf97966cc40375dc70c686 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 17699b17170db6b9ffcf6ffd332fc0cfc983d8ac - 4dfc3dbfd65c3c232d1e9321d6b7935389dbf566 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 324e1ef832db227483e8f52111e219a2ad94f67e - 6423930cf5b3415930abb45c9c48fb991e2cf842 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5046a82641c7b483c20812028106e771891fa8c0 - 2f21e992c73004d22b4752787472c75e4ed6944e - - - - - decimal(p) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a5e7e1443b21fe207b79ab4300b2ab90bc8a69ea - 30091097be5bc88ee6a9e4f8b5ec175078df2576 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - e0509c4cf92246c64c1f44892e866378cec1ee30 - 5ed51fee1299bd1ebc9f45127534fc806d0ab8e1 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 538b3f250c5594f837120b38e15103b7f1730d4a - 18d4616b20d068ccad4ecb854b2073ca2458b8df - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_menu_pc - - - - - 394369b90c0a5b6efeed3cf823c642605d7a1653 - false - - - - - false - true - idx_sys_menu_ts - - - - - 23f973124aedd0244533f4e7b3b103c548b966be - false - - - - - false - true - idx_sys_menu_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_menu_mt - - - - - c1a08754015d02b0489f0432d1a4f13db0384b71 - false - - - - - false - true - idx_sys_menu_pss - - - - - e8d877396943acfec73023dba2c1c6e3d7802d62 - false - - - - - false - true - idx_sys_menu_tss - - - - - 984d5eac2b3221118a61655e4a5a49c78e0f0151 - false - - - - - false - true - idx_sys_menu_sc - - - - - 5ed51fee1299bd1ebc9f45127534fc806d0ab8e1 - false - - - - - false - true - idx_sys_menu_is - - - - - 30091097be5bc88ee6a9e4f8b5ec175078df2576 - false - - - - - false - true - idx_sys_menu_mcs - - - - - 18d4616b20d068ccad4ecb854b2073ca2458b8df - false - - - - - false - true - idx_sys_menu_wt - - - - - 2f21e992c73004d22b4752787472c75e4ed6944e - false - - - - - - - - - -
dfd92f583371dc219fe0aeb5c64f4d7fc5b2db58620 @@ -10661,7 +10117,7 @@ - b180aa0bd8132f139ea09b1d4d2b9594f19a007f + 8a39f8544732bdd0c9731340ee2fe7e265b9b3cb a1303ae2ba44af053708a3742aee02836c407c3d 3c87a1572923924d481891ca9d1a09451008cef5 -1 @@ -10749,7 +10205,7 @@ 1882f53a36409270c8622486740876fcb2af9842 e84c40cdf5ffdb2ba4d59630d98abb5972d74795 - b180aa0bd8132f139ea09b1d4d2b9594f19a007f + 8a39f8544732bdd0c9731340ee2fe7e265b9b3cb @@ -16598,6 +16054,599 @@
+ + a1303ae2ba44af053708a3742aee02836c407c3d + 1218 + 617 + Segoe UI + 9 + 2280 + 36 + + 128 + 128 + 192 + + + + js_sys_menu + 菜单表 + + + + + + + adba31cfd94479f79feda2a3b90cc1bac3eed99f + e84c40cdf5ffdb2ba4d59630d98abb5972d74795 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + d5a4d04f60ce748f15b651a78cef47d1a14e19fa + 4a02b55091ae2d39146d66ec12708a3121efc3bc + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f22f8e8ec4f9a9edfc3a04de5c62d4cb485a0f82 + c1a08754015d02b0489f0432d1a4f13db0384b71 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 61ecd8a2f562b6c7540d73935c5ab7672d3f3bfc + 854fc4de71470d2d019c5c2a0dd235e163bef43e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + bcf07d65d41b82a0a96dc5da4faa8d4a2c52e3e9 + 95e937df6fffbcf8bedce5154965f2c8e7e1acd5 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1e3adac597a8668830a11c2652cc6adb661d941a + 8f4fdd0a58a54d8205bf97966cc40375dc70c686 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 17699b17170db6b9ffcf6ffd332fc0cfc983d8ac + 4dfc3dbfd65c3c232d1e9321d6b7935389dbf566 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e6d37962edd3a1eefde9a3795406fdd36887f1ac + 1aaf5f494723fa4747a006d991ac2e7f9cf2505f + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 324e1ef832db227483e8f52111e219a2ad94f67e + 6423930cf5b3415930abb45c9c48fb991e2cf842 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5046a82641c7b483c20812028106e771891fa8c0 + 2f21e992c73004d22b4752787472c75e4ed6944e + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a5e7e1443b21fe207b79ab4300b2ab90bc8a69ea + 30091097be5bc88ee6a9e4f8b5ec175078df2576 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e0509c4cf92246c64c1f44892e866378cec1ee30 + 5ed51fee1299bd1ebc9f45127534fc806d0ab8e1 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 538b3f250c5594f837120b38e15103b7f1730d4a + 18d4616b20d068ccad4ecb854b2073ca2458b8df + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_menu_pc + + + + + 394369b90c0a5b6efeed3cf823c642605d7a1653 + false + + + + + false + true + idx_sys_menu_ts + + + + + 23f973124aedd0244533f4e7b3b103c548b966be + false + + + + + false + true + idx_sys_menu_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_menu_mt + + + + + c1a08754015d02b0489f0432d1a4f13db0384b71 + false + + + + + false + true + idx_sys_menu_pss + + + + + e8d877396943acfec73023dba2c1c6e3d7802d62 + false + + + + + false + true + idx_sys_menu_tss + + + + + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + false + + + + + false + true + idx_sys_menu_sc + + + + + 5ed51fee1299bd1ebc9f45127534fc806d0ab8e1 + false + + + + + false + true + idx_sys_menu_is + + + + + 30091097be5bc88ee6a9e4f8b5ec175078df2576 + false + + + + + false + true + idx_sys_menu_mcs + + + + + 18d4616b20d068ccad4ecb854b2073ca2458b8df + false + + + + + false + true + idx_sys_menu_wt + + + + + 2f21e992c73004d22b4752787472c75e4ed6944e + false + + + + + + + + + +
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index f21dd61d..c95c9966 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -430,6 +430,7 @@ CREATE TABLE js_sys_menu menu_target varchar(20), menu_icon varchar(100), menu_color varchar(50), + menu_title varchar(100), permission varchar(1000), weight decimal(4), is_show char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE js_sys_role is_sys char(1), user_type varchar(16), data_scope char(1), + biz_scope varchar(255), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE js_sys_role remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 vargraphic(500), + extend_s2 vargraphic(500), + extend_s3 vargraphic(500), + extend_s4 vargraphic(500), + extend_s5 vargraphic(500), + extend_s6 vargraphic(500), + extend_s7 vargraphic(500), + extend_s8 vargraphic(500), + extend_i1 decimal(19), + extend_i2 decimal(19), + extend_i3 decimal(19), + extend_i4 decimal(19), + extend_f1 decimal(19,4), + extend_f2 decimal(19,4), + extend_f3 decimal(19,4), + extend_f4 decimal(19,4), + extend_d1 timestamp, + extend_d2 timestamp, + extend_d3 timestamp, + extend_d4 timestamp, PRIMARY KEY (role_code) ); diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 8eb4f02b..2a13a1e7 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -430,6 +430,7 @@ CREATE TABLE [js_sys_menu] [menu_target] varchar(20), [menu_icon] varchar(100), [menu_color] varchar(50), + [menu_title] varchar(100), [permission] varchar(1000), [weight] decimal(4), [is_show] char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE [js_sys_role] [is_sys] char(1), [user_type] varchar(16), [data_scope] char(1), + [biz_scope] varchar(255), [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, [create_date] datetime NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE [js_sys_role] [remarks] nvarchar(500), [corp_code] varchar(64) DEFAULT '0' NOT NULL, [corp_name] nvarchar(100) DEFAULT 'JeeSite' NOT NULL, + [extend_s1] nvarchar(500), + [extend_s2] nvarchar(500), + [extend_s3] nvarchar(500), + [extend_s4] nvarchar(500), + [extend_s5] nvarchar(500), + [extend_s6] nvarchar(500), + [extend_s7] nvarchar(500), + [extend_s8] nvarchar(500), + [extend_i1] decimal(19), + [extend_i2] decimal(19), + [extend_i3] decimal(19), + [extend_i4] decimal(19), + [extend_f1] decimal(19,4), + [extend_f2] decimal(19,4), + [extend_f3] decimal(19,4), + [extend_f4] decimal(19,4), + [extend_d1] datetime, + [extend_d2] datetime, + [extend_d3] datetime, + [extend_d4] datetime, PRIMARY KEY ([role_code]) ); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index a94e69c9..8fe2935e 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -432,6 +432,7 @@ CREATE TABLE js_sys_menu menu_target varchar(20) COMMENT '目标', menu_icon varchar(100) COMMENT '图标', menu_color varchar(50) COMMENT '颜色', + menu_title varchar(100) COMMENT '菜单标题', permission varchar(1000) COMMENT '权限标识', weight decimal(4) COMMENT '菜单权重', is_show char(1) NOT NULL COMMENT '是否显示（1显示 0隐藏）', @@ -684,6 +685,7 @@ CREATE TABLE js_sys_role is_sys char(1) COMMENT '系统内置（1是 0否）', user_type varchar(16) COMMENT '用户类型（employee员工 member会员）', data_scope char(1) COMMENT '数据范围设置（0未设置 1全部数据 2自定义数据）', + biz_scope varchar(255) 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 '创建时间', @@ -692,6 +694,26 @@ CREATE TABLE js_sys_role remarks varchar(500) COMMENT '备注信息', corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', + extend_s1 varchar(500) COMMENT '扩展 String 1', + extend_s2 varchar(500) COMMENT '扩展 String 2', + extend_s3 varchar(500) COMMENT '扩展 String 3', + extend_s4 varchar(500) COMMENT '扩展 String 4', + extend_s5 varchar(500) COMMENT '扩展 String 5', + extend_s6 varchar(500) COMMENT '扩展 String 6', + extend_s7 varchar(500) COMMENT '扩展 String 7', + extend_s8 varchar(500) COMMENT '扩展 String 8', + extend_i1 decimal(19) COMMENT '扩展 Integer 1', + extend_i2 decimal(19) COMMENT '扩展 Integer 2', + extend_i3 decimal(19) COMMENT '扩展 Integer 3', + extend_i4 decimal(19) COMMENT '扩展 Integer 4', + extend_f1 decimal(19,4) COMMENT '扩展 Float 1', + extend_f2 decimal(19,4) COMMENT '扩展 Float 2', + extend_f3 decimal(19,4) COMMENT '扩展 Float 3', + extend_f4 decimal(19,4) COMMENT '扩展 Float 4', + extend_d1 datetime COMMENT '扩展 Date 1', + extend_d2 datetime COMMENT '扩展 Date 2', + extend_d3 datetime COMMENT '扩展 Date 3', + extend_d4 datetime COMMENT '扩展 Date 4', PRIMARY KEY (role_code) ) COMMENT = '角色表'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index 9a3806cd..28a33097 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -430,6 +430,7 @@ CREATE TABLE js_sys_menu menu_target varchar2(20), menu_icon varchar2(100), menu_color varchar2(50), + menu_title varchar2(100), permission varchar2(1000), weight number(4), is_show char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE js_sys_role is_sys char(1), user_type varchar2(16), data_scope char(1), + biz_scope varchar2(255), status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, create_date timestamp NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE js_sys_role remarks nvarchar2(500), corp_code varchar2(64) DEFAULT '0' NOT NULL, corp_name nvarchar2(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 nvarchar2(500), + extend_s2 nvarchar2(500), + extend_s3 nvarchar2(500), + extend_s4 nvarchar2(500), + extend_s5 nvarchar2(500), + extend_s6 nvarchar2(500), + extend_s7 nvarchar2(500), + extend_s8 nvarchar2(500), + extend_i1 number(19), + extend_i2 number(19), + extend_i3 number(19), + extend_i4 number(19), + extend_f1 number(19,4), + extend_f2 number(19,4), + extend_f3 number(19,4), + extend_f4 number(19,4), + extend_d1 timestamp, + extend_d2 timestamp, + extend_d3 timestamp, + extend_d4 timestamp, PRIMARY KEY (role_code) ); @@ -1219,6 +1241,7 @@ COMMENT ON COLUMN js_sys_menu.menu_href IS '链接'; COMMENT ON COLUMN js_sys_menu.menu_target IS '目标'; COMMENT ON COLUMN js_sys_menu.menu_icon IS '图标'; COMMENT ON COLUMN js_sys_menu.menu_color IS '颜色'; +COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题'; COMMENT ON COLUMN js_sys_menu.permission IS '权限标识'; COMMENT ON COLUMN js_sys_menu.weight IS '菜单权重'; COMMENT ON COLUMN js_sys_menu.is_show IS '是否显示（1显示 0隐藏）'; @@ -1417,6 +1440,7 @@ COMMENT ON COLUMN js_sys_role.role_sort IS '角色排序（升序）'; COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）'; COMMENT ON COLUMN js_sys_role.user_type IS '用户类型（employee员工 member会员）'; 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.status IS '状态（0正常 1删除 2停用）'; COMMENT ON COLUMN js_sys_role.create_by IS '创建者'; COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; @@ -1425,6 +1449,26 @@ COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; +COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1'; +COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2'; +COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3'; +COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4'; +COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5'; +COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6'; +COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7'; +COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8'; +COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1'; +COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2'; +COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3'; +COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4'; +COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1'; +COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2'; +COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3'; +COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4'; +COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1'; +COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2'; +COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3'; +COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index d53d9f47..442265fe 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -430,6 +430,7 @@ CREATE TABLE js_sys_menu menu_target varchar(20), menu_icon varchar(100), menu_color varchar(50), + menu_title varchar(100), permission varchar(1000), weight decimal(4), is_show char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE js_sys_role is_sys char(1), user_type varchar(16), data_scope char(1), + biz_scope varchar(255), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE js_sys_role remarks varchar(500), corp_code varchar(64) DEFAULT '0' NOT NULL, corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 varchar(500), + extend_s2 varchar(500), + extend_s3 varchar(500), + extend_s4 varchar(500), + extend_s5 varchar(500), + extend_s6 varchar(500), + extend_s7 varchar(500), + extend_s8 varchar(500), + extend_i1 decimal(19), + extend_i2 decimal(19), + extend_i3 decimal(19), + extend_i4 decimal(19), + extend_f1 decimal(19,4), + extend_f2 decimal(19,4), + extend_f3 decimal(19,4), + extend_f4 decimal(19,4), + extend_d1 timestamp, + extend_d2 timestamp, + extend_d3 timestamp, + extend_d4 timestamp, PRIMARY KEY (role_code) ) WITHOUT OIDS; @@ -1219,6 +1241,7 @@ COMMENT ON COLUMN js_sys_menu.menu_href IS '链接'; COMMENT ON COLUMN js_sys_menu.menu_target IS '目标'; COMMENT ON COLUMN js_sys_menu.menu_icon IS '图标'; COMMENT ON COLUMN js_sys_menu.menu_color IS '颜色'; +COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题'; COMMENT ON COLUMN js_sys_menu.permission IS '权限标识'; COMMENT ON COLUMN js_sys_menu.weight IS '菜单权重'; COMMENT ON COLUMN js_sys_menu.is_show IS '是否显示（1显示 0隐藏）'; @@ -1417,6 +1440,7 @@ COMMENT ON COLUMN js_sys_role.role_sort IS '角色排序（升序）'; COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）'; COMMENT ON COLUMN js_sys_role.user_type IS '用户类型（employee员工 member会员）'; 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.status IS '状态（0正常 1删除 2停用）'; COMMENT ON COLUMN js_sys_role.create_by IS '创建者'; COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; @@ -1425,6 +1449,26 @@ COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; +COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1'; +COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2'; +COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3'; +COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4'; +COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5'; +COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6'; +COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7'; +COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8'; +COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1'; +COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2'; +COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3'; +COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4'; +COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1'; +COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2'; +COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3'; +COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4'; +COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1'; +COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2'; +COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3'; +COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型'; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 19f38ad0..63a7c1e8 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java index 4b1d7053..5a5c6cca 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OnlineController.java @@ -112,21 +112,25 @@ public class OnlineController extends BaseController{ list.add(map); } // 本地排序 - if (StringUtils.isNotBlank(orderBy)){ - final String[] ss = orderBy.trim().split(" "); - if (ss != null && ss.length == 2){ - Collections.sort(list, new Comparator>() { - @Override - public int compare(Map o1, Map o2) { - String s1 = (String)o1.get(ss[0]); - String s2 = (String)o2.get(ss[0]); - if ("asc".equals(ss[1])){ - return s1.compareTo(s2); - }else{ - return s2.compareTo(s1); - } - }}); - } + if (StringUtils.isBlank(orderBy)){ + orderBy = "lastAccessTime desc"; + } + final String[] ss = orderBy.trim().split(" "); + if (ss != null && ss.length == 2){ + Collections.sort(list, new Comparator>() { + @Override + public int compare(Map o1, Map o2) { + String s1 = (String)o1.get(ss[0]); + String s2 = (String)o2.get(ss[0]); + if (s1 == null || s2 == null){ + return -1; + } + if ("asc".equals(ss[1])){ + return s1.compareTo(s2); + }else{ + return s2.compareTo(s1); + } + }}); } return list; } 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 index e69de29b..5010a58b 100644 --- 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 @@ -0,0 +1,35 @@ + +-- 菜单表增加菜单标题（页签的名字） +ALTER TABLE ${_prefix}sys_menu ADD menu_title varchar(100) NULL; + +-- 角色业务范围字典数据 +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', getdate(), 'system', getdate(), ''); +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', getdate(), 'system', getdate(), '', '0', 'JeeSite', '', '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +-- 角色表增加适应业务范围 +ALTER TABLE ${_prefix}sys_role ADD biz_scope varchar(255) NULL; + +-- 角色表增加 20 个扩展字段 +ALTER TABLE ${_prefix}sys_role +ADD extend_s1 nvarchar(500), + extend_s2 nvarchar(500), + extend_s3 nvarchar(500), + extend_s4 nvarchar(500), + extend_s5 nvarchar(500), + extend_s6 nvarchar(500), + extend_s7 nvarchar(500), + extend_s8 nvarchar(500), + extend_i1 decimal(19), + extend_i2 decimal(19), + extend_i3 decimal(19), + extend_i4 decimal(19), + extend_f1 decimal(19,4), + extend_f2 decimal(19,4), + extend_f3 decimal(19,4), + extend_f4 decimal(19,4), + extend_d1 datetime, + extend_d2 datetime, + extend_d3 datetime, + extend_d4 datetime; 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 index 94a8b00c..87d2c976 100644 --- 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 @@ -3,17 +3,17 @@ ALTER TABLE `${_prefix}sys_menu` ADD COLUMN `menu_title` varchar(100) NULL COMMENT '菜单标题' AFTER `menu_color`; --- 角色表增加适应业务范围 -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); --- 角色表增加扩展字段 +-- 角色表增加适应业务范围 +ALTER TABLE `${_prefix}sys_role` +ADD COLUMN `biz_scope` varchar(255) NULL COMMENT '适应业务范围（不同的功能，不同的数据权限支持）' AFTER `data_scope`; + +-- 角色表增加 20 个扩展字段 ALTER TABLE `${_prefix}sys_role` ADD COLUMN extend_s1 varchar(500) COMMENT '扩展 String 1', ADD COLUMN extend_s2 varchar(500) COMMENT '扩展 String 2', 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 index e69de29b..59fde033 100644 --- 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 @@ -0,0 +1,57 @@ + +-- 菜单表增加菜单标题（页签的名字） +ALTER TABLE ${_prefix}sys_menu ADD menu_title varchar2(100) NULL; +COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题'; + +-- 角色业务范围字典数据 +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', sysdate, 'system', sysdate, ''); +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', sysdate, 'system', sysdate, '', '0', 'JeeSite', '', '', '', '', '', '', '', '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); + +-- 角色表增加适应业务范围 +ALTER TABLE ${_prefix}sys_role ADD biz_scope varchar2(255) NULL; +COMMENT ON COLUMN js_sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）'; + +-- 角色表增加 20 个扩展字段 +ALTER TABLE ${_prefix}sys_role +ADD (extend_s1 nvarchar2(500), + extend_s2 nvarchar2(500), + extend_s3 nvarchar2(500), + extend_s4 nvarchar2(500), + extend_s5 nvarchar2(500), + extend_s6 nvarchar2(500), + extend_s7 nvarchar2(500), + extend_s8 nvarchar2(500), + extend_i1 number(19), + extend_i2 number(19), + extend_i3 number(19), + extend_i4 number(19), + extend_f1 number(19,4), + extend_f2 number(19,4), + extend_f3 number(19,4), + extend_f4 number(19,4), + extend_d1 timestamp, + extend_d2 timestamp, + extend_d3 timestamp, + extend_d4 timestamp); +COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1'; +COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2'; +COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3'; +COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4'; +COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5'; +COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6'; +COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7'; +COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8'; +COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1'; +COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2'; +COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3'; +COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4'; +COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1'; +COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2'; +COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3'; +COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4'; +COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1'; +COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2'; +COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3'; +COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4'; 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 index e69de29b..2544ce48 100644 --- 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 @@ -0,0 +1,57 @@ + +-- 菜单表增加菜单标题（页签的名字） +ALTER TABLE ${_prefix}sys_menu ADD menu_title varchar(100) NULL; +COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题'; + +-- 角色业务范围字典数据 +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); + +-- 角色表增加适应业务范围 +ALTER TABLE ${_prefix}sys_role ADD COLUMN biz_scope varchar(255) NULL; +COMMENT ON COLUMN js_sys_role.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）'; + +-- 角色表增加 20 个扩展字段 +ALTER TABLE ${_prefix}sys_role +ADD COLUMN extend_s1 varchar(500), +ADD COLUMN extend_s2 varchar(500), +ADD COLUMN extend_s3 varchar(500), +ADD COLUMN extend_s4 varchar(500), +ADD COLUMN extend_s5 varchar(500), +ADD COLUMN extend_s6 varchar(500), +ADD COLUMN extend_s7 varchar(500), +ADD COLUMN extend_s8 varchar(500), +ADD COLUMN extend_i1 decimal(19), +ADD COLUMN extend_i2 decimal(19), +ADD COLUMN extend_i3 decimal(19), +ADD COLUMN extend_i4 decimal(19), +ADD COLUMN extend_f1 decimal(19,4), +ADD COLUMN extend_f2 decimal(19,4), +ADD COLUMN extend_f3 decimal(19,4), +ADD COLUMN extend_f4 decimal(19,4), +ADD COLUMN extend_d1 timestamp, +ADD COLUMN extend_d2 timestamp, +ADD COLUMN extend_d3 timestamp, +ADD COLUMN extend_d4 timestamp; +COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1'; +COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2'; +COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3'; +COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4'; +COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5'; +COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6'; +COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7'; +COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8'; +COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1'; +COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2'; +COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3'; +COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4'; +COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1'; +COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2'; +COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3'; +COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4'; +COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1'; +COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2'; +COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3'; +COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4'; diff --git a/modules/core/src/main/resources/db/upgrade/core/versions b/modules/core/src/main/resources/db/upgrade/core/versions index 095e8c03..23cd043e 100644 --- a/modules/core/src/main/resources/db/upgrade/core/versions +++ b/modules/core/src/main/resources/db/upgrade/core/versions @@ -11,4 +11,5 @@ 4.1.2 4.1.3 4.1.4 -4.1.5 \ No newline at end of file +4.1.5 +4.1.6 \ No newline at end of file diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html index 570cce7b..472fdfd3 100644 --- a/modules/core/src/main/resources/views/modules/sys/onlineList.html +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -28,7 +28,7 @@
- <#form:checkbox name="isVisitor" value="false" label="查询游客用户" + <#form:checkbox name="isVisitor" value="false" label="包含游客用户" class="form-control"/>
@@ -50,8 +50,8 @@ $('#dataGrid').dataGrid({ {header:'用户名称', name:'userName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){ return ''+(val||'游客'); }}, - {header:'创建时间', name:'startTimestamp', width:100, align:'center'}, - {header:'最后访问', name:'lastAccessTime', width:100, align:'center'}, + {header:'创建时间', name:'startTimestamp', firstsortorder:'desc', width:100, align:'center'}, + {header:'最后访问', name:'lastAccessTime', firstsortorder:'desc', width:100, align:'center'}, {header:'超时时间', name:'timeout', width:100, align:'center'}, {header:'客户主机', name:'host', width:70, align:'center'}, {header:'用户类型', name:'userType', width:50, align:'center', formatter: function(val, obj, row, act){ diff --git a/web/db/db2/core.sql b/web/db/db2/core.sql index f21dd61d..c95c9966 100644 --- a/web/db/db2/core.sql +++ b/web/db/db2/core.sql @@ -430,6 +430,7 @@ CREATE TABLE js_sys_menu menu_target varchar(20), menu_icon varchar(100), menu_color varchar(50), + menu_title varchar(100), permission varchar(1000), weight decimal(4), is_show char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE js_sys_role is_sys char(1), user_type varchar(16), data_scope char(1), + biz_scope varchar(255), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE js_sys_role remarks vargraphic(500), corp_code varchar(64) DEFAULT '0' NOT NULL, corp_name vargraphic(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 vargraphic(500), + extend_s2 vargraphic(500), + extend_s3 vargraphic(500), + extend_s4 vargraphic(500), + extend_s5 vargraphic(500), + extend_s6 vargraphic(500), + extend_s7 vargraphic(500), + extend_s8 vargraphic(500), + extend_i1 decimal(19), + extend_i2 decimal(19), + extend_i3 decimal(19), + extend_i4 decimal(19), + extend_f1 decimal(19,4), + extend_f2 decimal(19,4), + extend_f3 decimal(19,4), + extend_f4 decimal(19,4), + extend_d1 timestamp, + extend_d2 timestamp, + extend_d3 timestamp, + extend_d4 timestamp, PRIMARY KEY (role_code) ); diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index 8eb4f02b..2a13a1e7 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -430,6 +430,7 @@ CREATE TABLE [js_sys_menu] [menu_target] varchar(20), [menu_icon] varchar(100), [menu_color] varchar(50), + [menu_title] varchar(100), [permission] varchar(1000), [weight] decimal(4), [is_show] char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE [js_sys_role] [is_sys] char(1), [user_type] varchar(16), [data_scope] char(1), + [biz_scope] varchar(255), [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, [create_date] datetime NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE [js_sys_role] [remarks] nvarchar(500), [corp_code] varchar(64) DEFAULT '0' NOT NULL, [corp_name] nvarchar(100) DEFAULT 'JeeSite' NOT NULL, + [extend_s1] nvarchar(500), + [extend_s2] nvarchar(500), + [extend_s3] nvarchar(500), + [extend_s4] nvarchar(500), + [extend_s5] nvarchar(500), + [extend_s6] nvarchar(500), + [extend_s7] nvarchar(500), + [extend_s8] nvarchar(500), + [extend_i1] decimal(19), + [extend_i2] decimal(19), + [extend_i3] decimal(19), + [extend_i4] decimal(19), + [extend_f1] decimal(19,4), + [extend_f2] decimal(19,4), + [extend_f3] decimal(19,4), + [extend_f4] decimal(19,4), + [extend_d1] datetime, + [extend_d2] datetime, + [extend_d3] datetime, + [extend_d4] datetime, PRIMARY KEY ([role_code]) ); diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index a94e69c9..8fe2935e 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -432,6 +432,7 @@ CREATE TABLE js_sys_menu menu_target varchar(20) COMMENT '目标', menu_icon varchar(100) COMMENT '图标', menu_color varchar(50) COMMENT '颜色', + menu_title varchar(100) COMMENT '菜单标题', permission varchar(1000) COMMENT '权限标识', weight decimal(4) COMMENT '菜单权重', is_show char(1) NOT NULL COMMENT '是否显示（1显示 0隐藏）', @@ -684,6 +685,7 @@ CREATE TABLE js_sys_role is_sys char(1) COMMENT '系统内置（1是 0否）', user_type varchar(16) COMMENT '用户类型（employee员工 member会员）', data_scope char(1) COMMENT '数据范围设置（0未设置 1全部数据 2自定义数据）', + biz_scope varchar(255) 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 '创建时间', @@ -692,6 +694,26 @@ CREATE TABLE js_sys_role remarks varchar(500) COMMENT '备注信息', corp_code varchar(64) DEFAULT '0' NOT NULL COMMENT '租户代码', corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL COMMENT '租户名称', + extend_s1 varchar(500) COMMENT '扩展 String 1', + extend_s2 varchar(500) COMMENT '扩展 String 2', + extend_s3 varchar(500) COMMENT '扩展 String 3', + extend_s4 varchar(500) COMMENT '扩展 String 4', + extend_s5 varchar(500) COMMENT '扩展 String 5', + extend_s6 varchar(500) COMMENT '扩展 String 6', + extend_s7 varchar(500) COMMENT '扩展 String 7', + extend_s8 varchar(500) COMMENT '扩展 String 8', + extend_i1 decimal(19) COMMENT '扩展 Integer 1', + extend_i2 decimal(19) COMMENT '扩展 Integer 2', + extend_i3 decimal(19) COMMENT '扩展 Integer 3', + extend_i4 decimal(19) COMMENT '扩展 Integer 4', + extend_f1 decimal(19,4) COMMENT '扩展 Float 1', + extend_f2 decimal(19,4) COMMENT '扩展 Float 2', + extend_f3 decimal(19,4) COMMENT '扩展 Float 3', + extend_f4 decimal(19,4) COMMENT '扩展 Float 4', + extend_d1 datetime COMMENT '扩展 Date 1', + extend_d2 datetime COMMENT '扩展 Date 2', + extend_d3 datetime COMMENT '扩展 Date 3', + extend_d4 datetime COMMENT '扩展 Date 4', PRIMARY KEY (role_code) ) COMMENT = '角色表'; diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index 9a3806cd..28a33097 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -430,6 +430,7 @@ CREATE TABLE js_sys_menu menu_target varchar2(20), menu_icon varchar2(100), menu_color varchar2(50), + menu_title varchar2(100), permission varchar2(1000), weight number(4), is_show char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE js_sys_role is_sys char(1), user_type varchar2(16), data_scope char(1), + biz_scope varchar2(255), status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, create_date timestamp NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE js_sys_role remarks nvarchar2(500), corp_code varchar2(64) DEFAULT '0' NOT NULL, corp_name nvarchar2(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 nvarchar2(500), + extend_s2 nvarchar2(500), + extend_s3 nvarchar2(500), + extend_s4 nvarchar2(500), + extend_s5 nvarchar2(500), + extend_s6 nvarchar2(500), + extend_s7 nvarchar2(500), + extend_s8 nvarchar2(500), + extend_i1 number(19), + extend_i2 number(19), + extend_i3 number(19), + extend_i4 number(19), + extend_f1 number(19,4), + extend_f2 number(19,4), + extend_f3 number(19,4), + extend_f4 number(19,4), + extend_d1 timestamp, + extend_d2 timestamp, + extend_d3 timestamp, + extend_d4 timestamp, PRIMARY KEY (role_code) ); @@ -1219,6 +1241,7 @@ COMMENT ON COLUMN js_sys_menu.menu_href IS '链接'; COMMENT ON COLUMN js_sys_menu.menu_target IS '目标'; COMMENT ON COLUMN js_sys_menu.menu_icon IS '图标'; COMMENT ON COLUMN js_sys_menu.menu_color IS '颜色'; +COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题'; COMMENT ON COLUMN js_sys_menu.permission IS '权限标识'; COMMENT ON COLUMN js_sys_menu.weight IS '菜单权重'; COMMENT ON COLUMN js_sys_menu.is_show IS '是否显示（1显示 0隐藏）'; @@ -1417,6 +1440,7 @@ COMMENT ON COLUMN js_sys_role.role_sort IS '角色排序（升序）'; COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）'; COMMENT ON COLUMN js_sys_role.user_type IS '用户类型（employee员工 member会员）'; 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.status IS '状态（0正常 1删除 2停用）'; COMMENT ON COLUMN js_sys_role.create_by IS '创建者'; COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; @@ -1425,6 +1449,26 @@ COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; +COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1'; +COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2'; +COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3'; +COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4'; +COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5'; +COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6'; +COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7'; +COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8'; +COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1'; +COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2'; +COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3'; +COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4'; +COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1'; +COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2'; +COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3'; +COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4'; +COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1'; +COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2'; +COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3'; +COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型'; diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index d53d9f47..442265fe 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -430,6 +430,7 @@ CREATE TABLE js_sys_menu menu_target varchar(20), menu_icon varchar(100), menu_color varchar(50), + menu_title varchar(100), permission varchar(1000), weight decimal(4), is_show char(1) NOT NULL, @@ -682,6 +683,7 @@ CREATE TABLE js_sys_role is_sys char(1), user_type varchar(16), data_scope char(1), + biz_scope varchar(255), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, @@ -690,6 +692,26 @@ CREATE TABLE js_sys_role remarks varchar(500), corp_code varchar(64) DEFAULT '0' NOT NULL, corp_name varchar(100) DEFAULT 'JeeSite' NOT NULL, + extend_s1 varchar(500), + extend_s2 varchar(500), + extend_s3 varchar(500), + extend_s4 varchar(500), + extend_s5 varchar(500), + extend_s6 varchar(500), + extend_s7 varchar(500), + extend_s8 varchar(500), + extend_i1 decimal(19), + extend_i2 decimal(19), + extend_i3 decimal(19), + extend_i4 decimal(19), + extend_f1 decimal(19,4), + extend_f2 decimal(19,4), + extend_f3 decimal(19,4), + extend_f4 decimal(19,4), + extend_d1 timestamp, + extend_d2 timestamp, + extend_d3 timestamp, + extend_d4 timestamp, PRIMARY KEY (role_code) ) WITHOUT OIDS; @@ -1219,6 +1241,7 @@ COMMENT ON COLUMN js_sys_menu.menu_href IS '链接'; COMMENT ON COLUMN js_sys_menu.menu_target IS '目标'; COMMENT ON COLUMN js_sys_menu.menu_icon IS '图标'; COMMENT ON COLUMN js_sys_menu.menu_color IS '颜色'; +COMMENT ON COLUMN js_sys_menu.menu_title IS '菜单标题'; COMMENT ON COLUMN js_sys_menu.permission IS '权限标识'; COMMENT ON COLUMN js_sys_menu.weight IS '菜单权重'; COMMENT ON COLUMN js_sys_menu.is_show IS '是否显示（1显示 0隐藏）'; @@ -1417,6 +1440,7 @@ COMMENT ON COLUMN js_sys_role.role_sort IS '角色排序（升序）'; COMMENT ON COLUMN js_sys_role.is_sys IS '系统内置（1是 0否）'; COMMENT ON COLUMN js_sys_role.user_type IS '用户类型（employee员工 member会员）'; 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.status IS '状态（0正常 1删除 2停用）'; COMMENT ON COLUMN js_sys_role.create_by IS '创建者'; COMMENT ON COLUMN js_sys_role.create_date IS '创建时间'; @@ -1425,6 +1449,26 @@ COMMENT ON COLUMN js_sys_role.update_date IS '更新时间'; COMMENT ON COLUMN js_sys_role.remarks IS '备注信息'; COMMENT ON COLUMN js_sys_role.corp_code IS '租户代码'; COMMENT ON COLUMN js_sys_role.corp_name IS '租户名称'; +COMMENT ON COLUMN js_sys_role.extend_s1 IS '扩展 String 1'; +COMMENT ON COLUMN js_sys_role.extend_s2 IS '扩展 String 2'; +COMMENT ON COLUMN js_sys_role.extend_s3 IS '扩展 String 3'; +COMMENT ON COLUMN js_sys_role.extend_s4 IS '扩展 String 4'; +COMMENT ON COLUMN js_sys_role.extend_s5 IS '扩展 String 5'; +COMMENT ON COLUMN js_sys_role.extend_s6 IS '扩展 String 6'; +COMMENT ON COLUMN js_sys_role.extend_s7 IS '扩展 String 7'; +COMMENT ON COLUMN js_sys_role.extend_s8 IS '扩展 String 8'; +COMMENT ON COLUMN js_sys_role.extend_i1 IS '扩展 Integer 1'; +COMMENT ON COLUMN js_sys_role.extend_i2 IS '扩展 Integer 2'; +COMMENT ON COLUMN js_sys_role.extend_i3 IS '扩展 Integer 3'; +COMMENT ON COLUMN js_sys_role.extend_i4 IS '扩展 Integer 4'; +COMMENT ON COLUMN js_sys_role.extend_f1 IS '扩展 Float 1'; +COMMENT ON COLUMN js_sys_role.extend_f2 IS '扩展 Float 2'; +COMMENT ON COLUMN js_sys_role.extend_f3 IS '扩展 Float 3'; +COMMENT ON COLUMN js_sys_role.extend_f4 IS '扩展 Float 4'; +COMMENT ON COLUMN js_sys_role.extend_d1 IS '扩展 Date 1'; +COMMENT ON COLUMN js_sys_role.extend_d2 IS '扩展 Date 2'; +COMMENT ON COLUMN js_sys_role.extend_d3 IS '扩展 Date 3'; +COMMENT ON COLUMN js_sys_role.extend_d4 IS '扩展 Date 4'; COMMENT ON TABLE js_sys_role_data_scope IS '角色数据权限表'; COMMENT ON COLUMN js_sys_role_data_scope.role_code IS '控制角色编码'; COMMENT ON COLUMN js_sys_role_data_scope.ctrl_type IS '控制类型';