diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 32ee4cb2..a9ad75f5 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,7 +11,7 @@ 0 0.8 - 0 + 527 0 128 @@ -3879,6 +3879,22 @@ sys_code varchar(n) + + e3fd120d7cf01762365f6b32141ea4ba61e8fa93 + 500 + null + false + null + false + false + false + + false + + 包含系统（多个用逗号隔开） + sys_codes + nvarchar(n) + f53f151fcfc0c5008da4d5314a50ef425a61c482 64 @@ -4330,7 +4346,7 @@ - e7782d105c0664dd6ee95bcac5dba9ecc4251211 + 64e342cfdd999ebd9567d93f4988fd70665e91be a8f21c5c539513f061e28e40498c4b0fbd121d58 5610e69a25bb47786125753202755cad4cfdfcc4 -1 @@ -4418,7 +4434,7 @@ ffde396c7b349d700fe1b7891694ac538d00bf6d 22d38cfee95536d3e3af5fdd444b027a85d95432 - e7782d105c0664dd6ee95bcac5dba9ecc4251211 + 64e342cfdd999ebd9567d93f4988fd70665e91be @@ -6168,7 +6184,7 @@ null - 3eb194ba905f1d27d2dd98c90ac3113d25ceef43 + 1bf10906dc4a3a62c0cb08cc453c2e5d15aee46a a8f21c5c539513f061e28e40498c4b0fbd121d58 8644d50869c92389db93388f7fb4345344c58d50 -1 @@ -6200,7 +6216,7 @@ 136c2841a88ba120cd1f0bb13f7ba446474de69e 22d38cfee95536d3e3af5fdd444b027a85d95432 - 3eb194ba905f1d27d2dd98c90ac3113d25ceef43 + 1bf10906dc4a3a62c0cb08cc453c2e5d15aee46a @@ -10691,7 +10707,7 @@ null - 7416c5f9961c5eca80efe73c79977ece51e64e4d + f83ec21cc7a247bc0499ba6a7538afaa6c079182 a8f21c5c539513f061e28e40498c4b0fbd121d58 4b179bc12c6d797a69f39713d180cf90b334b82b -1 @@ -10757,7 +10773,7 @@ 2514d7a64ce6b0f5bafa582a5330a36f073efdcc 22d38cfee95536d3e3af5fdd444b027a85d95432 - 7416c5f9961c5eca80efe73c79977ece51e64e4d + f83ec21cc7a247bc0499ba6a7538afaa6c079182 @@ -12081,7 +12097,7 @@ - d0e7d41f2e10299333990f4b5d1feb2e39a0c61f + b8ac2947a6466aa0eb1bb5f4253bb1d2c062f777 a8f21c5c539513f061e28e40498c4b0fbd121d58 73e3e5c18d79ce2498e7b7ca2b08cf50e6678b85 -1 @@ -12113,7 +12129,7 @@ 7e2f59707205419c8556876dc854aeff0fbf7b57 22d38cfee95536d3e3af5fdd444b027a85d95432 - d0e7d41f2e10299333990f4b5d1feb2e39a0c61f + b8ac2947a6466aa0eb1bb5f4253bb1d2c062f777 控制角色编码 @@ -16146,30 +16162,52 @@ - a8f21c5c539513f061e28e40498c4b0fbd121d58 - 1088 - 586 + 09089ec6581f4c870cc3435d26f2d2aa8f71d9e4 + 1218 + 387Segoe UI9 - 1272 - 36 + 2880 + 76 128 128 192 + + 38961d4e63a7186a3bfa3306ef62d63f192661b3 + b32c22bf3d62e142d894cd7d55ad9ed7060c598c + 09089ec6581f4c870cc3435d26f2d2aa8f71d9e4 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + false + + RESTRICT + RESTRICT + 4f8af0766a0ba0866db74d9fe750581d1eefea91 + null + - js_sys_role - 角色表 + js_sys_dict_data + 字典数据表 - 0939f982d8d703b2e27b802da88b1ba1eeb11c63 - 22d38cfee95536d3e3af5fdd444b027a85d95432 + 32c7f5bb206f025610dd8211c6d397ee4845f3a3 + 424e7476db4a216fdf3eee470ce921c356f07e5e @@ -16201,8 +16239,42 @@ - bf04028c4beab99e1c35c6a22ffa6f9b745a49f5 - ecf6453361ea95112d99a48d499d245033596daf + 9ca0e5536ea6174629b791183977dcc92c13f908 + 396fee69de4e5229fae2bbdd0501e98cb740bfe5 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + cc294effb178877401baf60d266faff21b80c5ea + 99f4c815f19a4256e44625dac3423eaba8f23da1 @@ -16234,8 +16306,8 @@ - f8eb9e170834e6718449d7a1a498b10988a804e8 - d843c1da291df80d978f3b8cb9fc87615fa58c54 + a4c755ab584ef5ca499f4e3412caa6d99305b36e + 12111b66aa47de5aec6126db15dd7ec2bc35ae83 @@ -16267,8 +16339,9 @@ - 261201b437ac0f92fe52da10902425f2391f0fa8 - 6bd0ef3540d4ec60b76dcbf8202a929fabb20f1b + 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 + 4f8af0766a0ba0866db74d9fe750581d1eefea91 + 38961d4e63a7186a3bfa3306ef62d63f192661b3 @@ -16277,41 +16350,8 @@ false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f7482b471418bdd790ae93233367f1d6315506ed - 1033b538c81cfc078c51eca175cf765d88459b30 - - - - - decimal(p) - - - false - false - false + true + true false false @@ -16334,7 +16374,7 @@ 7feb27963741f108bd29ccf401a0f25ec6f588ff - 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 + 0baae707c361b3286955f0587b34476fd4f36cfd @@ -16344,7 +16384,7 @@ false false - false + true false false @@ -16366,46 +16406,13 @@ - 7ede749964c58b2f89c5d600d755376de251adb3 - d0d9f3a7c38458268d03e5fcd310e99b451de4cf + b3d67ac6d9320b61db546035ec7c8e487fd8a9c4 + 41906c8f63b3a63fb41393d75e45d10a247e492d - character(n) - - 1 - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b395e79cb48e870a827a4ea6436f7d00c2f18111 - 86b833a3be962a3cd6e79502f72d48b455bf247d - - - - - varchar(n) + nvarchar(n) false @@ -16432,13 +16439,13 @@ - b46bf1a5226bd88b939a730ea4ab9b09b6b9124e - 36933452d2faab2e35268ce2aec7f8e4d64266c9 + 1310f67a2772a72e48216c23deb7f7e7ef6f0041 + 645203ee29b1ee73a7f0d5e9878b4227a8b7302c - varchar(n) + nvarchar(n) false @@ -16465,46 +16472,13 @@ - 1b0f1b3a4e3073d84bc2c8406195d3eaa5276c19 - 00a708c89cdb80f2a937084230260e35dc689c4b + 1f24bfd07483cf3e59f6ecbd4966755d9670df74 + ac7e17e899d099929e517e74f7a116c939840895 - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 9c7b6cb6e8190ee30301f5046f6caceb0d9914d0 - ca48faffcf40d18afd892ce5378f1b17aa5eb785 - - - - - varchar(n) + nvarchar(n) false @@ -16538,7 +16512,7 @@ false true - idx_sys_role_cc + idx_sys_dict_data_cc @@ -16551,12 +16525,12 @@ false true - idx_sys_role_is + idx_sys_dict_data_dt - 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 + 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 false @@ -16564,7 +16538,20 @@ false true - idx_sys_role_status + idx_sys_dict_data_pc + + + + + 394369b90c0a5b6efeed3cf823c642605d7a1653 + false + + + + + false + true + idx_sys_dict_data_status @@ -16577,12 +16564,51 @@ false true - idx_sys_role_rs + idx_sys_dict_data_pcs - 1033b538c81cfc078c51eca175cf765d88459b30 + e8d877396943acfec73023dba2c1c6e3d7802d62 + false + + + + + false + true + idx_sys_dict_data_ts + + + + + 23f973124aedd0244533f4e7b3b103c548b966be + false + + + + + false + true + idx_sys_dict_data_tss + + + + + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + false + + + + + false + true + idx_sys_dict_data_dv + + + + + 99f4c815f19a4256e44625dac3423eaba8f23da1 false @@ -17254,52 +17280,30 @@
- 09089ec6581f4c870cc3435d26f2d2aa8f71d9e4 - 1218 - 387 + a8f21c5c539513f061e28e40498c4b0fbd121d58 + 1088 + 586Segoe UI9 - 2880 - 76 + 1272 + 36 128 128 192 - - 38961d4e63a7186a3bfa3306ef62d63f192661b3 - b32c22bf3d62e142d894cd7d55ad9ed7060c598c - 09089ec6581f4c870cc3435d26f2d2aa8f71d9e4 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 1 - false - - RESTRICT - RESTRICT - 4f8af0766a0ba0866db74d9fe750581d1eefea91 - null - - js_sys_dict_data - 字典数据表 + js_sys_role + 角色表 - 32c7f5bb206f025610dd8211c6d397ee4845f3a3 - 424e7476db4a216fdf3eee470ce921c356f07e5e + 0939f982d8d703b2e27b802da88b1ba1eeb11c63 + 22d38cfee95536d3e3af5fdd444b027a85d95432 @@ -17331,42 +17335,8 @@ - 9ca0e5536ea6174629b791183977dcc92c13f908 - 396fee69de4e5229fae2bbdd0501e98cb740bfe5 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - a535b6c506004a7fdf4d48984c9ff2cfa59c157a - - cc294effb178877401baf60d266faff21b80c5ea - 99f4c815f19a4256e44625dac3423eaba8f23da1 + bf04028c4beab99e1c35c6a22ffa6f9b745a49f5 + ecf6453361ea95112d99a48d499d245033596daf @@ -17398,8 +17368,8 @@ - a4c755ab584ef5ca499f4e3412caa6d99305b36e - 12111b66aa47de5aec6126db15dd7ec2bc35ae83 + f8eb9e170834e6718449d7a1a498b10988a804e8 + d843c1da291df80d978f3b8cb9fc87615fa58c54 @@ -17431,9 +17401,8 @@ - 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 - 4f8af0766a0ba0866db74d9fe750581d1eefea91 - 38961d4e63a7186a3bfa3306ef62d63f192661b3 + 261201b437ac0f92fe52da10902425f2391f0fa8 + 6bd0ef3540d4ec60b76dcbf8202a929fabb20f1b @@ -17442,8 +17411,41 @@ false - true - true + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f7482b471418bdd790ae93233367f1d6315506ed + 1033b538c81cfc078c51eca175cf765d88459b30 + + + + + decimal(p) + + + false + false + false false false @@ -17466,7 +17468,7 @@ 7feb27963741f108bd29ccf401a0f25ec6f588ff - 0baae707c361b3286955f0587b34476fd4f36cfd + 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 @@ -17476,7 +17478,7 @@ false false - true + false false false @@ -17498,13 +17500,46 @@ - b3d67ac6d9320b61db546035ec7c8e487fd8a9c4 - 41906c8f63b3a63fb41393d75e45d10a247e492d + 7ede749964c58b2f89c5d600d755376de251adb3 + d0d9f3a7c38458268d03e5fcd310e99b451de4cf - nvarchar(n) + character(n) + + 1 + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b395e79cb48e870a827a4ea6436f7d00c2f18111 + 86b833a3be962a3cd6e79502f72d48b455bf247d + + + + + varchar(n) false @@ -17531,13 +17566,13 @@ - 1310f67a2772a72e48216c23deb7f7e7ef6f0041 - 645203ee29b1ee73a7f0d5e9878b4227a8b7302c + b46bf1a5226bd88b939a730ea4ab9b09b6b9124e + 36933452d2faab2e35268ce2aec7f8e4d64266c9 - nvarchar(n) + varchar(n) false @@ -17564,8 +17599,74 @@ - 1f24bfd07483cf3e59f6ecbd4966755d9670df74 - ac7e17e899d099929e517e74f7a116c939840895 + 1b0f1b3a4e3073d84bc2c8406195d3eaa5276c19 + 00a708c89cdb80f2a937084230260e35dc689c4b + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 9c7b6cb6e8190ee30301f5046f6caceb0d9914d0 + ca48faffcf40d18afd892ce5378f1b17aa5eb785 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + e3fd120d7cf01762365f6b32141ea4ba61e8fa93 + 2d50b9352f94db590c73254bdb3671ad5cb481a2 @@ -17604,7 +17705,7 @@ false true - idx_sys_dict_data_cc + idx_sys_role_cc @@ -17617,12 +17718,12 @@ false true - idx_sys_dict_data_dt + idx_sys_role_is - 2dbcbafe51e51ecb4546a0ebfe8767536a1eaaa8 + 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 false @@ -17630,20 +17731,7 @@ false true - idx_sys_dict_data_pc - - - - - 394369b90c0a5b6efeed3cf823c642605d7a1653 - false - - - - - false - true - idx_sys_dict_data_status + idx_sys_role_status @@ -17656,51 +17744,12 @@ false true - idx_sys_dict_data_pcs + idx_sys_role_rs - e8d877396943acfec73023dba2c1c6e3d7802d62 - false - - - - - false - true - idx_sys_dict_data_ts - - - - - 23f973124aedd0244533f4e7b3b103c548b966be - false - - - - - false - true - idx_sys_dict_data_tss - - - - - 984d5eac2b3221118a61655e4a5a49c78e0f0151 - false - - - - - false - true - idx_sys_dict_data_dv - - - - - 99f4c815f19a4256e44625dac3423eaba8f23da1 + 1033b538c81cfc078c51eca175cf765d88459b30 false diff --git a/modules/core/db/core.png b/modules/core/db/core.png index ba11f7cd..a2502ce1 100644 Binary files a/modules/core/db/core.png and b/modules/core/db/core.png differ diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 29cc91a9..48a59ad8 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -699,6 +699,7 @@ CREATE TABLE js_sys_role desktop_url varchar(255), data_scope char(1), biz_scope varchar(255), + sys_codes vargraphic(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, diff --git a/modules/core/db/h2/core.sql b/modules/core/db/h2/core.sql index 1ed7e055..7d24d4bf 100644 --- a/modules/core/db/h2/core.sql +++ b/modules/core/db/h2/core.sql @@ -699,6 +699,7 @@ CREATE TABLE js_sys_role desktop_url varchar(255), data_scope char(1), biz_scope varchar(255), + sys_codes varchar(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date datetime NOT NULL, diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index 3d1b6cbc..1251be04 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -699,6 +699,7 @@ CREATE TABLE [js_sys_role] [desktop_url] varchar(255), [data_scope] char(1), [biz_scope] varchar(255), + [sys_codes] nvarchar(500), [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, [create_date] datetime NOT NULL, diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 0de567b9..074b3dee 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -700,6 +700,7 @@ CREATE TABLE js_sys_role desktop_url varchar(255) COMMENT '桌面地址（仪表盘地址）', 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停用）', create_by varchar(64) NOT NULL COMMENT '创建者', create_date datetime NOT NULL COMMENT '创建时间', diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index e779bcd3..e8abc9d9 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -699,6 +699,7 @@ CREATE TABLE js_sys_role desktop_url varchar2(255), data_scope char(1), biz_scope varchar2(255), + sys_codes nvarchar2(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, create_date timestamp NOT NULL, @@ -1504,6 +1505,7 @@ 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.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）'; +COMMENT ON COLUMN js_sys_role.sys_codes 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 '创建时间'; diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 49d86fba..5cec682c 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -699,6 +699,7 @@ CREATE TABLE js_sys_role desktop_url varchar(255), data_scope char(1), biz_scope varchar(255), + sys_codes varchar(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, @@ -1504,6 +1505,7 @@ 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.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）'; +COMMENT ON COLUMN js_sys_role.sys_codes 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 '创建时间'; diff --git a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java index fefd80e2..d9bf0073 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/filter/FormFilter.java @@ -456,6 +456,7 @@ public class FormFilter extends org.apache.shiro.web.filter.authc.FormAuthentica roleMap.put("roleCode", role.getRoleCode()); roleMap.put("roleName", role.getRoleName()); roleMap.put("isShow", role.getIsShow()); + roleMap.put("sysCodes", role.getSysCodes()); roleList.add(roleMap); if (desktopUrl == null && StringUtils.isNotBlank(role.getDesktopUrl())) { desktopUrl = role.getDesktopUrl(); diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml index 9fdeae95..83c53101 100644 --- a/modules/core/src/main/resources/config/jeesite-core.yml +++ b/modules/core/src/main/resources/config/jeesite-core.yml @@ -708,7 +708,7 @@ file: imageMaxWidth: 1024 imageMaxHeight: 768 - # 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.4.2 + # 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.5.0 #imageThumbConfig: 150x150,300x300 #imageThumbFormat: jpg diff --git a/modules/core/src/main/resources/db/create/db2/core.sql b/modules/core/src/main/resources/db/create/db2/core.sql index ef7a57b0..f062bb7b 100644 --- a/modules/core/src/main/resources/db/create/db2/core.sql +++ b/modules/core/src/main/resources/db/create/db2/core.sql @@ -699,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role desktop_url varchar(255), data_scope char(1), biz_scope varchar(255), + sys_codes vargraphic(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, diff --git a/modules/core/src/main/resources/db/create/h2/core.sql b/modules/core/src/main/resources/db/create/h2/core.sql index 0f825f03..1e4e9d0c 100644 --- a/modules/core/src/main/resources/db/create/h2/core.sql +++ b/modules/core/src/main/resources/db/create/h2/core.sql @@ -699,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role desktop_url varchar(255), data_scope char(1), biz_scope varchar(255), + sys_codes varchar(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date datetime NOT NULL, diff --git a/modules/core/src/main/resources/db/create/mssql/core.sql b/modules/core/src/main/resources/db/create/mssql/core.sql index 0271bf90..deb53f52 100644 --- a/modules/core/src/main/resources/db/create/mssql/core.sql +++ b/modules/core/src/main/resources/db/create/mssql/core.sql @@ -699,6 +699,7 @@ CREATE TABLE [${_prefix}sys_role] [desktop_url] varchar(255), [data_scope] char(1), [biz_scope] varchar(255), + [sys_codes] nvarchar(500), [status] char(1) DEFAULT '0' NOT NULL, [create_by] varchar(64) NOT NULL, [create_date] datetime NOT NULL, diff --git a/modules/core/src/main/resources/db/create/mysql/core.sql b/modules/core/src/main/resources/db/create/mysql/core.sql index f11317a9..f23fecee 100644 --- a/modules/core/src/main/resources/db/create/mysql/core.sql +++ b/modules/core/src/main/resources/db/create/mysql/core.sql @@ -700,6 +700,7 @@ CREATE TABLE ${_prefix}sys_role desktop_url varchar(255) COMMENT '桌面地址（仪表盘地址）', 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停用）', create_by varchar(64) NOT NULL COMMENT '创建者', create_date datetime NOT NULL COMMENT '创建时间', diff --git a/modules/core/src/main/resources/db/create/oracle/core.sql b/modules/core/src/main/resources/db/create/oracle/core.sql index 0512912e..649c3324 100644 --- a/modules/core/src/main/resources/db/create/oracle/core.sql +++ b/modules/core/src/main/resources/db/create/oracle/core.sql @@ -699,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role desktop_url varchar2(255), data_scope char(1), biz_scope varchar2(255), + sys_codes nvarchar2(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar2(64) NOT NULL, create_date timestamp NOT NULL, @@ -1504,6 +1505,7 @@ COMMENT ON COLUMN ${_prefix}sys_role.user_type IS '用户类型（employee员工 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.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）'; +COMMENT ON COLUMN ${_prefix}sys_role.sys_codes IS '包含系统（多个用逗号隔开）'; COMMENT ON COLUMN ${_prefix}sys_role.status IS '状态（0正常 1删除 2停用）'; COMMENT ON COLUMN ${_prefix}sys_role.create_by IS '创建者'; COMMENT ON COLUMN ${_prefix}sys_role.create_date IS '创建时间'; diff --git a/modules/core/src/main/resources/db/create/postgresql/core.sql b/modules/core/src/main/resources/db/create/postgresql/core.sql index f5c747cc..d3d4ffb8 100644 --- a/modules/core/src/main/resources/db/create/postgresql/core.sql +++ b/modules/core/src/main/resources/db/create/postgresql/core.sql @@ -321,7 +321,6 @@ CREATE TABLE ${_prefix}sys_file_upload ) WITHOUT OIDS; - -- 作业调度表 CREATE TABLE ${_prefix}sys_job ( @@ -700,6 +699,7 @@ CREATE TABLE ${_prefix}sys_role desktop_url varchar(255), data_scope char(1), biz_scope varchar(255), + sys_codes varchar(500), status char(1) DEFAULT '0' NOT NULL, create_by varchar(64) NOT NULL, create_date timestamp NOT NULL, @@ -1505,6 +1505,7 @@ COMMENT ON COLUMN ${_prefix}sys_role.user_type IS '用户类型（employee员工 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.biz_scope IS '适应业务范围（不同的功能，不同的数据权限支持）'; +COMMENT ON COLUMN ${_prefix}sys_role.sys_codes IS '包含系统（多个用逗号隔开）'; COMMENT ON COLUMN ${_prefix}sys_role.status IS '状态（0正常 1删除 2停用）'; COMMENT ON COLUMN ${_prefix}sys_role.create_by IS '创建者'; COMMENT ON COLUMN ${_prefix}sys_role.create_date IS '创建时间'; diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties index 5a63a608..b44e3bc2 100644 --- a/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties +++ b/modules/core/src/main/resources/i18n/core/sys/i18n_en.properties @@ -379,6 +379,7 @@ 角色名称=Role name 角色名称已存在=Role name already exists 授权功能菜单=Authorization menu +包含系统=Include system 未设置=None 本人数据=Self data diff --git a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties index 4fc34273..a798450c 100644 --- a/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties +++ b/modules/core/src/main/resources/i18n/core/sys/i18n_ja_JP.properties @@ -304,6 +304,7 @@ 角色名称=キャラクター名 角色名称已存在=キャラクター名が存在する 授权功能菜单=ライセンス機能メニュー +包含系统=含めたシステム 未设置=未設置 全部数据=すべてのデータ diff --git a/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html b/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html index 3b2147b5..787e6424 100644 --- a/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html +++ b/modules/core/src/main/resources/views/include/sysIndex/topMenuUser.html @@ -17,19 +17,32 @@ ${text('退出登录')} - <% var sysDictList = @DictUtils.getDictList('sys_menu_sys_code'); - if(sysDictList.~size > 1){ - var menuSysCode = @ObjectUtils.toStringIgnoreNull(session.sysCode, 'default'); %> + <% var sysCodes = []; + for(var role in user.roleList) { + var codes = @StringUtils.splitComma(role.sysCodes); + if (!isEmpty(codes)) { + for (var code in codes) { + @sysCodes.add(code); + } + } + } + var sysDictList = @DictUtils.getDictList('sys_menu_sys_code'); + if(sysDictList.~size > 1){ + var menuSysCode = @ObjectUtils.toStringIgnoreNull(session.sysCode, 'default'); %>
  • ${text('系统切换')}：
    • - <% for(var dict in sysDictList){ %> + <% for(var dict in sysDictList){ + if(sysCodes.~size == 0 || @ListUtils.inString(dict.dictValue, sysCodes)){ %>
  • ${dict.dictLabel}
    • - <% } %> + <% + } + } + %>
  • <% }else{ %>
  • diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml index 96166c68..51be08e3 100644 --- a/web-api/src/main/resources/config/application.yml +++ b/web-api/src/main/resources/config/application.yml @@ -849,7 +849,7 @@ file: # imageMaxWidth: 1024 # imageMaxHeight: 768 # -# # 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.4.2 +# # 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.5.0 # #imageThumbConfig: 150x150,300x300 # #imageThumbFormat: jpg # diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml index 95d33a10..36037e1e 100644 --- a/web/src/main/resources/config/application.yml +++ b/web/src/main/resources/config/application.yml @@ -849,7 +849,7 @@ file: # imageMaxWidth: 1024 # imageMaxHeight: 768 # -# # 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.4.2 +# # 缩略图设定，生成的尺寸（宽x高,宽x高）、格式（jpg,png） v5.5.0 # #imageThumbConfig: 150x150,300x300 # #imageThumbFormat: jpg #