diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 8ba9c732..7aba184c 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,7 +11,7 @@ 0 1.0 - 1443 + 226 0 128 @@ -4151,6 +4151,22 @@ view_code varchar(n) + + e1175184bd4e4a8c61e51076a8a65ac0371e5cb4 + 100 + null + false + null + false + false + false + + false + 岗位代码 + 岗位代码 + view_code + varchar(n) + 87b8aa1c7178b4ce728dac87ce65c43bec953427 100 @@ -4167,6 +4183,22 @@ view_code varchar(n) + + f8eb9e170834e6718449d7a1a498b10988a804e8 + 100 + null + false + null + false + false + false + + false + 角色代码 + 角色代码 + view_code + varchar(n) + 5046a82641c7b483c20812028106e771891fa8c0 4 @@ -4234,7 +4266,7 @@ - ac06f26d082bda5d6e9b1e7868f9a4cafbf2d2b2 + 52fb0e09a36d7ee134636fe487df7bfed558e291 f6a8962b7fcb6101a25612849c208419604d342c cb48c1cac141bb138bedb45c67fcae800e7e2767 -1 @@ -4322,7 +4354,7 @@ ffde396c7b349d700fe1b7891694ac538d00bf6d 22d38cfee95536d3e3af5fdd444b027a85d95432 - ac06f26d082bda5d6e9b1e7868f9a4cafbf2d2b2 + 52fb0e09a36d7ee134636fe487df7bfed558e291 @@ -4602,7 +4634,7 @@ null - 465f6e6cf94d54066bf3ed6825525842fc06119c + f50fd74f1a2bd481e516f838545518021a40db1b 6615f2ce0ec05caf1a51f92d1c2b458984ac9db6 54d156398db07de97741ea8035283f424eae82dc -1 @@ -4668,7 +4700,7 @@ c06047702cc26617e350accac3afdbb589cf5cf4 ed19c91e49d39e19cffec01c77c369cd2ea1c989 - 465f6e6cf94d54066bf3ed6825525842fc06119c + f50fd74f1a2bd481e516f838545518021a40db1b @@ -6795,210 +6827,6 @@ - - 6615f2ce0ec05caf1a51f92d1c2b458984ac9db6 - 296 - 373 - Segoe UI - 9 - 36 - 36 - - 128 - 128 - 192 - - - - js_sys_post - 员工岗位表 - - - - - - - c7414ff6615cec2297f4ac0e40cac1fd77b7dc51 - ed19c91e49d39e19cffec01c77c369cd2ea1c989 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - a7fd696bf0b4d6135cd8d9602d5b622896a3d708 - a17d7b11efbe170a82448b6ac389463e6c9b4dae - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 604aada9016061972b5fc4eeb951c4671f5307c4 - c47d32d84a5e1182a2f05ff1add8483117b13afd - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 40205670c71732eff440d692bfe2addb1fa7f728 - 197e6e932604cb4d72a8572426221048094400a2 - - - - - decimal(p) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - - - - false - true - idx_sys_post_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_post_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_post_ps - - - - - 197e6e932604cb4d72a8572426221048094400a2 - false - - - - - - - - - -
3674020785393b0615fba55ad49015a88e83da12152 @@ -7014,7 +6842,7 @@ - 8b4652d56f049fe627d01ee2d9c178c63fba97a8 + c1f6eab98af43262c5a61b9cb08edd208d47eb53 f6a8962b7fcb6101a25612849c208419604d342c 3674020785393b0615fba55ad49015a88e83da12 -1 @@ -7046,7 +6874,7 @@ 7e2f59707205419c8556876dc854aeff0fbf7b57 22d38cfee95536d3e3af5fdd444b027a85d95432 - 8b4652d56f049fe627d01ee2d9c178c63fba97a8 + c1f6eab98af43262c5a61b9cb08edd208d47eb53 控制角色编码 @@ -7419,7 +7247,7 @@ null - e964bb38e9bcb42616fd70e540e144da53f11676 + 3da4524aab4ea5a2b7d1f2b34187af32afcabed7 f6a8962b7fcb6101a25612849c208419604d342c 3c87a1572923924d481891ca9d1a09451008cef5 -1 @@ -7451,7 +7279,7 @@ 136c2841a88ba120cd1f0bb13f7ba446474de69e 22d38cfee95536d3e3af5fdd444b027a85d95432 - e964bb38e9bcb42616fd70e540e144da53f11676 + 3da4524aab4ea5a2b7d1f2b34187af32afcabed7 @@ -7525,475 +7353,6 @@
- - 3d247382b17eebade65fa207bb37d089d3c8042a - 1244 - 387 - Segoe UI - 9 - 48 - 792 - - 128 - 128 - 192 - - - - js_sys_office - 组织机构表 - - - - - - - a5fffb704f5efbf6cba1e9e81fd45336d06f06c0 - 512f24dbe486a211117dfb58e689ef3e0e5009a0 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - a535b6c506004a7fdf4d48984c9ff2cfa59c157a - - 87b8aa1c7178b4ce728dac87ce65c43bec953427 - 362544a460470412b9160888e562c4a582626f0e - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2b8439b512c0d6df70ca5f7c65bfd30a32def655 - 2c78fac5e5d538c5e2fa790b4ce1e0217547d271 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 60bc76a5c1e1f5559a42184bff19549d11c7173a - 32800aecf8993dd18a08cbed7711c76cf62a0c21 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7de44d266aacfd2735733386ead9dffd140cdef4 - 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b458d603ccaa8a68b8e7f4af5bc49b45cab7d11c - 16612d3a02d933279b078bd47f663acefa60e8c5 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 73f7a37e9b9d7dbfe21646c4fab3347a7d204913 - 7b0e850652cfc5cd4e87982e33f5787f6db36704 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 666f23b96ed873b11a77ceca096cafe42631af5f - 148bc18726ef2a8682f8cc0c8ae4859e090564e0 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 275cece5dc0985966870fa12af1ce5928b902eb0 - d63923c59ef1fcecc6a5d5853f41fb3915b3e010 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 329bbb76f0884117ace79bb686695f4e9cb120b6 - a524d13c791fb53b1465c6c814d96eff6798b2c3 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_office_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_office_pc - - - - - 394369b90c0a5b6efeed3cf823c642605d7a1653 - false - - - - - false - true - idx_sys_office_pcs - - - - - e8d877396943acfec73023dba2c1c6e3d7802d62 - false - - - - - false - true - idx_sys_office_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_office_ot - - - - - 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 - false - - - - - false - true - idx_sys_office_vc - - - - - 362544a460470412b9160888e562c4a582626f0e - false - - - - - false - true - idx_sys_office_ts - - - - - 23f973124aedd0244533f4e7b3b103c548b966be - false - - - - - false - true - idx_sys_office_tss - - - - - 984d5eac2b3221118a61655e4a5a49c78e0f0151 - false - - - - - - - - - -
7b39a711a7c61b1a62397f6e097656793a21c517100 @@ -11566,7 +10925,7 @@ null - 4c04a7a14b8549b8df50dcb17c7aaaf5c0e55c28 + a7605c5665967cd151b41299c8d2a89565b71ebc 6615f2ce0ec05caf1a51f92d1c2b458984ac9db6 f151f987251ae4e9949b5ed48822458897360e0b -1 @@ -11699,7 +11058,7 @@ 01a869279c2c0890d8b66c49ffee318db227eb0f ed19c91e49d39e19cffec01c77c369cd2ea1c989 - 4c04a7a14b8549b8df50dcb17c7aaaf5c0e55c28 + a7605c5665967cd151b41299c8d2a89565b71ebc @@ -11739,356 +11098,6 @@
- - f6a8962b7fcb6101a25612849c208419604d342c - 984 - 586 - Segoe UI - 9 - 1656 - 384 - - 128 - 128 - 192 - - - - js_sys_role - 角色表 - - - - - - - 0939f982d8d703b2e27b802da88b1ba1eeb11c63 - 22d38cfee95536d3e3af5fdd444b027a85d95432 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - bf04028c4beab99e1c35c6a22ffa6f9b745a49f5 - ecf6453361ea95112d99a48d499d245033596daf - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 261201b437ac0f92fe52da10902425f2391f0fa8 - 6bd0ef3540d4ec60b76dcbf8202a929fabb20f1b - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f7482b471418bdd790ae93233367f1d6315506ed - 1033b538c81cfc078c51eca175cf765d88459b30 - - - - - decimal(p) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7feb27963741f108bd29ccf401a0f25ec6f588ff - 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b395e79cb48e870a827a4ea6436f7d00c2f18111 - 86b833a3be962a3cd6e79502f72d48b455bf247d - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 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 - - - 35ae805d1da92afdb99b2fe8c536d1649356fccd - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_role_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_role_is - - - - - 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 - false - - - - - false - true - idx_sys_role_status - - - - - f0036584bd8711715579d21994a0105935605a7e - false - - - - - false - true - idx_sys_role_rs - - - - - 1033b538c81cfc078c51eca175cf765d88459b30 - false - - - - - - - - - -
8a139a0643de7dcb7489ba3a6eb8072830e2442c906 @@ -17317,6 +16326,1095 @@
+ + 3d247382b17eebade65fa207bb37d089d3c8042a + 1244 + 387 + Segoe UI + 9 + 48 + 792 + + 128 + 128 + 192 + + + + js_sys_office + 组织机构表 + + + + + + + a5fffb704f5efbf6cba1e9e81fd45336d06f06c0 + 512f24dbe486a211117dfb58e689ef3e0e5009a0 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + a535b6c506004a7fdf4d48984c9ff2cfa59c157a + + 87b8aa1c7178b4ce728dac87ce65c43bec953427 + 362544a460470412b9160888e562c4a582626f0e + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2b8439b512c0d6df70ca5f7c65bfd30a32def655 + 2c78fac5e5d538c5e2fa790b4ce1e0217547d271 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 60bc76a5c1e1f5559a42184bff19549d11c7173a + 32800aecf8993dd18a08cbed7711c76cf62a0c21 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7de44d266aacfd2735733386ead9dffd140cdef4 + 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b458d603ccaa8a68b8e7f4af5bc49b45cab7d11c + 16612d3a02d933279b078bd47f663acefa60e8c5 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 73f7a37e9b9d7dbfe21646c4fab3347a7d204913 + 7b0e850652cfc5cd4e87982e33f5787f6db36704 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 666f23b96ed873b11a77ceca096cafe42631af5f + 148bc18726ef2a8682f8cc0c8ae4859e090564e0 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 275cece5dc0985966870fa12af1ce5928b902eb0 + d63923c59ef1fcecc6a5d5853f41fb3915b3e010 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 329bbb76f0884117ace79bb686695f4e9cb120b6 + a524d13c791fb53b1465c6c814d96eff6798b2c3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_office_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_office_pc + + + + + 394369b90c0a5b6efeed3cf823c642605d7a1653 + false + + + + + false + true + idx_sys_office_pcs + + + + + e8d877396943acfec73023dba2c1c6e3d7802d62 + false + + + + + false + true + idx_sys_office_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_office_ot + + + + + 6eab10bd38fccfdcc5a25f66389ba23a3192b6c9 + false + + + + + false + true + idx_sys_office_vc + + + + + 362544a460470412b9160888e562c4a582626f0e + false + + + + + false + true + idx_sys_office_ts + + + + + 23f973124aedd0244533f4e7b3b103c548b966be + false + + + + + false + true + idx_sys_office_tss + + + + + 984d5eac2b3221118a61655e4a5a49c78e0f0151 + false + + + + + + + + + +
+ + 6615f2ce0ec05caf1a51f92d1c2b458984ac9db6 + 296 + 373 + Segoe UI + 9 + 36 + 36 + + 128 + 128 + 192 + + + + js_sys_post + 员工岗位表 + + + + + + + c7414ff6615cec2297f4ac0e40cac1fd77b7dc51 + ed19c91e49d39e19cffec01c77c369cd2ea1c989 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + e1175184bd4e4a8c61e51076a8a65ac0371e5cb4 + 5d58f1543a182370620c0e15df6ee9e1693536fe + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a7fd696bf0b4d6135cd8d9602d5b622896a3d708 + a17d7b11efbe170a82448b6ac389463e6c9b4dae + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 604aada9016061972b5fc4eeb951c4671f5307c4 + c47d32d84a5e1182a2f05ff1add8483117b13afd + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 40205670c71732eff440d692bfe2addb1fa7f728 + 197e6e932604cb4d72a8572426221048094400a2 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + + + + false + true + idx_sys_post_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_post_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_post_ps + + + + + 197e6e932604cb4d72a8572426221048094400a2 + false + + + + + + + + + +
+ + f6a8962b7fcb6101a25612849c208419604d342c + 984 + 586 + Segoe UI + 9 + 1656 + 384 + + 128 + 128 + 192 + + + + js_sys_role + 角色表 + + + + + + + 0939f982d8d703b2e27b802da88b1ba1eeb11c63 + 22d38cfee95536d3e3af5fdd444b027a85d95432 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + bf04028c4beab99e1c35c6a22ffa6f9b745a49f5 + ecf6453361ea95112d99a48d499d245033596daf + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f8eb9e170834e6718449d7a1a498b10988a804e8 + d843c1da291df80d978f3b8cb9fc87615fa58c54 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 261201b437ac0f92fe52da10902425f2391f0fa8 + 6bd0ef3540d4ec60b76dcbf8202a929fabb20f1b + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f7482b471418bdd790ae93233367f1d6315506ed + 1033b538c81cfc078c51eca175cf765d88459b30 + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7feb27963741f108bd29ccf401a0f25ec6f588ff + 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b395e79cb48e870a827a4ea6436f7d00c2f18111 + 86b833a3be962a3cd6e79502f72d48b455bf247d + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 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 + + + 35ae805d1da92afdb99b2fe8c536d1649356fccd + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_role_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_role_is + + + + + 39019eef1ff9876f6e75eb44e94aa9e4d8e79523 + false + + + + + false + true + idx_sys_role_status + + + + + f0036584bd8711715579d21994a0105935605a7e + false + + + + + false + true + idx_sys_role_rs + + + + + 1033b538c81cfc078c51eca175cf765d88459b30 + false + + + + + + + + + +
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java index 512f5a41..eae1c7e2 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java @@ -98,7 +98,7 @@ public class Office extends TreeEntity { } @NotBlank(message="机构代码不能为空") - @Pattern(regexp="[a-zA-Z0-9_]{0,30}", message="编码长度不能大于 30 个字符，并且只能包含字母、数字、下划线") + @Pattern(regexp="[a-zA-Z0-9_]{0,30}", message="代码长度不能大于 30 个字符，并且只能包含字母、数字、下划线") public String getViewCode() { return viewCode; } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java index 0eeeb47e..10bb8a9b 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java @@ -5,6 +5,7 @@ package com.jeesite.modules.sys.entity; import javax.validation.constraints.Size; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; import com.jeesite.common.entity.BaseEntity; import com.jeesite.common.entity.DataEntity; @@ -16,6 +17,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType; @Column(includeEntity=BaseEntity.class), @Column(includeEntity=DataEntity.class), @Column(name="post_code", attrName="postCode", label="岗位编码", isPK=true), + @Column(name="view_code", attrName="viewCode", label="岗位代码"), @Column(name="post_name", attrName="postName", label="岗位名称"), @Column(name="post_type", attrName="postType", label="岗位分类", comment="岗位分类（高管、中层、基层）"), @Column(name="post_sort", attrName="postSort", label="岗位排序", comment="岗位排序（升序）"), @@ -25,6 +27,7 @@ public class Post extends DataEntity { private static final long serialVersionUID = 1L; private String postCode; // 岗位编码 + private String viewCode; // 岗位代码（作为显示用，多租户内唯一） private String postName; // 岗位名称 private String postType; // 岗位分类（高管、中层、基层） private Integer postSort; // 岗位排序（升序） @@ -47,6 +50,16 @@ public class Post extends DataEntity { this.postCode = postCode; } + @NotBlank(message="岗位代码不能为空") + @Pattern(regexp="[a-zA-Z0-9_]{0,30}", message="代码长度不能大于 30 个字符，并且只能包含字母、数字、下划线") + public String getViewCode() { + return viewCode; + } + + public void setViewCode(String viewCode) { + this.viewCode = viewCode; + } + @NotBlank(message="岗位名称不能为空") @Size(min=0, max=100, message="岗位名称长度不能超过 100 个字符") public String getPostName() { diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java index f61771dc..4beb8f79 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/PostServiceSupport.java @@ -51,6 +51,10 @@ public class PostServiceSupport extends CrudService @Override @Transactional(readOnly=false) public void save(Post post) { + if (post.getIsNewRecord()){ + // 生成主键，并验证改主键是否存在，如存在则抛出验证信息 + genIdAndValid(post, post.getViewCode()); + } super.save(post); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java index 013f6518..3525d2e6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/CompanyController.java @@ -248,6 +248,7 @@ public class CompanyController extends BaseController { if ("true".equals(isShowFullName) || "1".equals(isShowFullName)){ name = e.getFullName(); } + map.put("code", e.getViewCode()); map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getViewCode(), name)); map.put("title", e.getFullName()); mapList.add(map); diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java index 10c2dec0..db2a0f86 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java @@ -322,6 +322,7 @@ public class OfficeController extends BaseController { if ("true".equals(isShowFullName) || "1".equals(isShowFullName)){ name = e.getFullName(); } + map.put("code", e.getViewCode()); map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getViewCode(), name)); map.put("title", e.getFullName()); // 如果需要加载用户，则处理用户数据 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java index 17b8e177..2f6f35d9 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/PostController.java @@ -147,7 +147,8 @@ public class PostController extends BaseController { Map map = MapUtils.newHashMap(); map.put("id", e.getId()); map.put("pId", "0"); - map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getPostCode(), e.getPostName())); + map.put("code", e.getViewCode()); + map.put("name", StringUtils.getTreeNodeName(isShowCode, e.getViewCode(), e.getPostName())); mapList.add(map); }); return mapList; diff --git a/modules/core/src/main/resources/views/modules/sys/postForm.html b/modules/core/src/main/resources/views/modules/sys/postForm.html index d7cb9b75..787599cb 100644 --- a/modules/core/src/main/resources/views/modules/sys/postForm.html +++ b/modules/core/src/main/resources/views/modules/sys/postForm.html @@ -28,10 +28,11 @@
+ * ${text('岗位代码')}：
<#form:hidden path="isNewRecord"/> - <#form:input path="postCode" maxlength="64" readonly="${!post.isNewRecord}" class="form-control required abc"/> + <#form:hidden path="postCode"/> + <#form:input path="viewCode" maxlength="64" readonly="${!post.isNewRecord}" class="form-control required abc"/>