From 4cd0666ce8b1c846a7afc88abf710155bd598d32 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Fri, 28 Feb 2020 12:39:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E6=9C=BA=E6=9E=84=E9=AA=8C=E8=AF=81=EF=BC=9B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E9=95=BF=E5=BA=A6200?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/core/db/core.erm | 2546 ++++++++--------- .../support/EmpUserServiceSupport.java | 7 + 2 files changed, 1280 insertions(+), 1273 deletions(-) diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 6e23c617..38a5c5ab 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -11,8 +11,8 @@ 0 1.0 - 18 - 431 + 196 + 0 128 128 @@ -2696,8 +2696,8 @@ varchar(n) - 1c4770699874e998061aa859fad20a30e288e49f - 100 + 747d0db2fe9de2a328a1f39ef6a11a915afada04 + 200 null false null @@ -7130,1275 +7130,6 @@ - - 0ded13a505cc3bfde24edfbae369231be192a59b - 1283 - 520 - Segoe UI - 9 - 968 - 36 - - 128 - 128 - 192 - - - - 9a24a5fe2b90473016e496df5121ad7b1f2cfe4c - 26e4b2554a744e584fba5f3b88c267026359e727 - 0ded13a505cc3bfde24edfbae369231be192a59b - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 0..1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_user - 用户表 - - - - - - - 72cb012455ead4444ad451f28f6bac51ad9b5130 - e59481cc0025d4da3d55201ee470c33b2c12a575 - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - b6a52f87ba533a819eb169768b846266226d641c - 4a7e78125c8684dc6f98b67cc49e4600866da601 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 17cc9c14f8fd31cc61e610dda56a2948f5b8266e - 54e129fdccc85d57a91f4b26761f017a7b22e8f0 - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1c4770699874e998061aa859fad20a30e288e49f - f4ca0ea98363e69ea86e53f92ee70978245388ef - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 329bbb76f0884117ace79bb686695f4e9cb120b6 - b26b503c2f877d3c0610ba8e6852be92620a3d49 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 04844023ecf0480ce786e53a5246e93cc875987f - 620cec0bfffd079cada15bb8d5f7f23ef8717109 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 73f7a37e9b9d7dbfe21646c4fab3347a7d204913 - cf2697e60824d45e6e66a9ea985717d2b8841131 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b63e72d00089330f9932863eeb972e87d94cabce - c301c85a224df4e7ce77ca09bf4b6f2e50b50642 - - - - - character(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - c138ba567a58d48a0a7a6e7cb56d33c1dc38b17c - 32945a48787fa20f4b0b4133a85dcf18fc9e47ce - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 4551bd6ffaf84e43ffaaf7fa7ec5a46c37935f24 - 19d69134b891c06724cdad70e4fd14312b978e1e - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5537317393b9e8a86c73daf8d584ace898c0d267 - 0a1fff9c46e4ea49d99ed9a7b7681391af3607ee - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 8738d2bb42a1224d22235ec41e1358b890a50955 - 2490bcd7f26c115f7adabda428129e87783211c0 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 1c01776985dea9bd14e14cb8a97ab836bb4871ee - f2136ede82ec814cf359a6e4f74b8de48338516b - - - - - varchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f22a1cfec76101d87da3a951bb05d7700418c1c1 - ab8b402ea35a78cdadd5ed446d571c9a80b532ee - 9a24a5fe2b90473016e496df5121ad7b1f2cfe4c - 用户类型引用编号，例如如：当user_type为1员工的时候，ref_code关联的为emp_code - - 用户类型引用编号 - ref_code - varchar(n) - - - false - true - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f95a0e3e0b66048e979ae0488e387f09e1c94f50 - 662dab21d6bd0ae2d75bec66ddb34790d579d565 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - a960c1b4db1c00820c60b00152ddb17ef23fd0b8 - 6eb87d824bfedf47085bce06da8006148c601c9b - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cd995bcf9d5a67f471bb214c921b8b229de30767 - 9de6b3b40e6c17d2f9214f7871889c228d14ffea - - - - - decimal(p) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 9ce384c009a431f01fe6840373567782fab32249 - f99f45da94370a47298447010dec4ae231dbb779 - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 89226cf84f03f0a56ec7adcbf4781049b97121f9 - 7ac242ca565ca0b0a0ecffbe368aca76fe23dcfc - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 23d9751f44d62a87de371c36b52664bec7e7815c - de9b948748edf1d767e92d5d379d2a579702e1c8 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 7f2a6a606ce3ff27a3778bacc036afb74d3b7346 - f33c455810ac391cddb65c8c3d939e5007945e37 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 8026c23bd056a83798a77e010c2b810e6738f1fb - 6d0fffe12130e4430a4b007f3c8d65ba42acd01c - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 347c6496b6dc5e98d61a159e55f8aa8b847f3fba - 2e621caaa75bf294661856f123b945ac50f3b0ae - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - dffce782b8e0d921036feb32eb8137a84a937de9 - e71aff805f5202b16def2bea0ba95e132559b204 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 6986b6de1581af248bdcdc6fc9e5d2f300c26c14 - b5eb7a2850f2b31c0766b4f58e97a19ad9f8f46e - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 8c9ea8f33293f42f4bdee7a8251152567a4e731d - 3e6071509571b1f7b649afc687f8fde46f884585 - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 01dfcccb43a2647979ef648912e43b8982c0cf42 - f900cc3efaa636755391acd8c539d790e37d01f3 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2c9ac39dfb195a0768ec52f0b2a3e96dc3575819 - cbdf583d25790f552e2714bc6c88908dae42948f - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2492476f4d92ca4051cc9cd883c427585bd01a7d - 2ece1cf7fd02751a2a9b462401909610f3b637ea - - - - - datetime - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - c1d6e02f5f9a31d6a494f646bbff8479fa3f52b9 - ff6668e0065bce65ac23f86c1db19bd619baed10 - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 5cb9825e5780cc2b9bdfffc62b843892cec567ed - becd6c448ab4475068df58270f59642e68921951 - - - - - decimal(p) - - 0 - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b2b945d048896baab43ae931af786e910224b43b - 40e6f855e21171ce241d4e842703cfeb439d61a6 - - - - - char - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - 118dab95fc1f792cd468b9f66af2d4fabd98c39b - - - - false - true - idx_sys_user_lc - - - - - 4a7e78125c8684dc6f98b67cc49e4600866da601 - false - - - - - false - true - idx_sys_user_email - - - - - b26b503c2f877d3c0610ba8e6852be92620a3d49 - false - - - - - false - true - idx_sys_user_mobile - - - - - 620cec0bfffd079cada15bb8d5f7f23ef8717109 - false - - - - - false - true - idx_sys_user_wo - - - - - 0a1fff9c46e4ea49d99ed9a7b7681391af3607ee - false - - - - - false - true - idx_sys_user_imei - - - - - 2490bcd7f26c115f7adabda428129e87783211c0 - false - - - - - false - true - idx_sys_user_rt - - - - - f2136ede82ec814cf359a6e4f74b8de48338516b - false - - - - - false - true - idx_sys_user_rc - - - - - f22a1cfec76101d87da3a951bb05d7700418c1c1 - false - - - - - false - true - idx_sys_user_mt - - - - - 6eb87d824bfedf47085bce06da8006148c601c9b - false - - - - - false - true - idx_sys_user_us - - - - - becd6c448ab4475068df58270f59642e68921951 - false - - - - - false - true - idx_sys_user_ud - - - - - ee78b079f7d319bf8119fd01439cd97424ff49fa - false - - - - - false - true - idx_sys_user_status - - - - - 40e6f855e21171ce241d4e842703cfeb439d61a6 - false - - - - - false - true - idx_sys_user_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - - - - - -
6615f2ce0ec05caf1a51f92d1c2b458984ac9db6296 @@ -16745,6 +15476,1275 @@
+ + 0ded13a505cc3bfde24edfbae369231be192a59b + 1283 + 520 + Segoe UI + 9 + 968 + 36 + + 128 + 128 + 192 + + + + 9a24a5fe2b90473016e496df5121ad7b1f2cfe4c + 26e4b2554a744e584fba5f3b88c267026359e727 + 0ded13a505cc3bfde24edfbae369231be192a59b + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 0..1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_user + 用户表 + + + + + + + 72cb012455ead4444ad451f28f6bac51ad9b5130 + e59481cc0025d4da3d55201ee470c33b2c12a575 + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + b6a52f87ba533a819eb169768b846266226d641c + 4a7e78125c8684dc6f98b67cc49e4600866da601 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 17cc9c14f8fd31cc61e610dda56a2948f5b8266e + 54e129fdccc85d57a91f4b26761f017a7b22e8f0 + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 747d0db2fe9de2a328a1f39ef6a11a915afada04 + f4ca0ea98363e69ea86e53f92ee70978245388ef + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 329bbb76f0884117ace79bb686695f4e9cb120b6 + b26b503c2f877d3c0610ba8e6852be92620a3d49 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 04844023ecf0480ce786e53a5246e93cc875987f + 620cec0bfffd079cada15bb8d5f7f23ef8717109 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 73f7a37e9b9d7dbfe21646c4fab3347a7d204913 + cf2697e60824d45e6e66a9ea985717d2b8841131 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b63e72d00089330f9932863eeb972e87d94cabce + c301c85a224df4e7ce77ca09bf4b6f2e50b50642 + + + + + character(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c138ba567a58d48a0a7a6e7cb56d33c1dc38b17c + 32945a48787fa20f4b0b4133a85dcf18fc9e47ce + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 4551bd6ffaf84e43ffaaf7fa7ec5a46c37935f24 + 19d69134b891c06724cdad70e4fd14312b978e1e + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5537317393b9e8a86c73daf8d584ace898c0d267 + 0a1fff9c46e4ea49d99ed9a7b7681391af3607ee + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8738d2bb42a1224d22235ec41e1358b890a50955 + 2490bcd7f26c115f7adabda428129e87783211c0 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 1c01776985dea9bd14e14cb8a97ab836bb4871ee + f2136ede82ec814cf359a6e4f74b8de48338516b + + + + + varchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f22a1cfec76101d87da3a951bb05d7700418c1c1 + ab8b402ea35a78cdadd5ed446d571c9a80b532ee + 9a24a5fe2b90473016e496df5121ad7b1f2cfe4c + 用户类型引用编号，例如如：当user_type为1员工的时候，ref_code关联的为emp_code + + 用户类型引用编号 + ref_code + varchar(n) + + + false + true + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f95a0e3e0b66048e979ae0488e387f09e1c94f50 + 662dab21d6bd0ae2d75bec66ddb34790d579d565 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + a960c1b4db1c00820c60b00152ddb17ef23fd0b8 + 6eb87d824bfedf47085bce06da8006148c601c9b + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cd995bcf9d5a67f471bb214c921b8b229de30767 + 9de6b3b40e6c17d2f9214f7871889c228d14ffea + + + + + decimal(p) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 9ce384c009a431f01fe6840373567782fab32249 + f99f45da94370a47298447010dec4ae231dbb779 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 89226cf84f03f0a56ec7adcbf4781049b97121f9 + 7ac242ca565ca0b0a0ecffbe368aca76fe23dcfc + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 23d9751f44d62a87de371c36b52664bec7e7815c + de9b948748edf1d767e92d5d379d2a579702e1c8 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 7f2a6a606ce3ff27a3778bacc036afb74d3b7346 + f33c455810ac391cddb65c8c3d939e5007945e37 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8026c23bd056a83798a77e010c2b810e6738f1fb + 6d0fffe12130e4430a4b007f3c8d65ba42acd01c + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 347c6496b6dc5e98d61a159e55f8aa8b847f3fba + 2e621caaa75bf294661856f123b945ac50f3b0ae + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + dffce782b8e0d921036feb32eb8137a84a937de9 + e71aff805f5202b16def2bea0ba95e132559b204 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 6986b6de1581af248bdcdc6fc9e5d2f300c26c14 + b5eb7a2850f2b31c0766b4f58e97a19ad9f8f46e + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8c9ea8f33293f42f4bdee7a8251152567a4e731d + 3e6071509571b1f7b649afc687f8fde46f884585 + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 01dfcccb43a2647979ef648912e43b8982c0cf42 + f900cc3efaa636755391acd8c539d790e37d01f3 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2c9ac39dfb195a0768ec52f0b2a3e96dc3575819 + cbdf583d25790f552e2714bc6c88908dae42948f + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2492476f4d92ca4051cc9cd883c427585bd01a7d + 2ece1cf7fd02751a2a9b462401909610f3b637ea + + + + + datetime + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + c1d6e02f5f9a31d6a494f646bbff8479fa3f52b9 + ff6668e0065bce65ac23f86c1db19bd619baed10 + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 5cb9825e5780cc2b9bdfffc62b843892cec567ed + becd6c448ab4475068df58270f59642e68921951 + + + + + decimal(p) + + 0 + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b2b945d048896baab43ae931af786e910224b43b + 40e6f855e21171ce241d4e842703cfeb439d61a6 + + + + + char + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + 118dab95fc1f792cd468b9f66af2d4fabd98c39b + + + + false + true + idx_sys_user_lc + + + + + 4a7e78125c8684dc6f98b67cc49e4600866da601 + false + + + + + false + true + idx_sys_user_email + + + + + b26b503c2f877d3c0610ba8e6852be92620a3d49 + false + + + + + false + true + idx_sys_user_mobile + + + + + 620cec0bfffd079cada15bb8d5f7f23ef8717109 + false + + + + + false + true + idx_sys_user_wo + + + + + 0a1fff9c46e4ea49d99ed9a7b7681391af3607ee + false + + + + + false + true + idx_sys_user_imei + + + + + 2490bcd7f26c115f7adabda428129e87783211c0 + false + + + + + false + true + idx_sys_user_rt + + + + + f2136ede82ec814cf359a6e4f74b8de48338516b + false + + + + + false + true + idx_sys_user_rc + + + + + f22a1cfec76101d87da3a951bb05d7700418c1c1 + false + + + + + false + true + idx_sys_user_mt + + + + + 6eb87d824bfedf47085bce06da8006148c601c9b + false + + + + + false + true + idx_sys_user_us + + + + + becd6c448ab4475068df58270f59642e68921951 + false + + + + + false + true + idx_sys_user_ud + + + + + ee78b079f7d319bf8119fd01439cd97424ff49fa + false + + + + + false + true + idx_sys_user_status + + + + + 40e6f855e21171ce241d4e842703cfeb439d61a6 + false + + + + + false + true + idx_sys_user_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + + + + + +
diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index e06d983c..408cf3af 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -172,6 +172,13 @@ public class EmpUserServiceSupport extends CrudService try{ // 验证数据文件 ValidatorUtils.validateWithException(user); + // 部门为空验证 + if (StringUtils.isBlank(user.getEmployee().getOffice().getOfficeCode())) { + failureNum++; + failureMsg.append("
" + failureNum + "、账号 " + user.getLoginCode() + + " 导入失败：归属机构不能为空"); + continue; + } // 验证是否存在这个用户 User u = UserUtils.getByLoginCode(user.getLoginCode()); if (u == null){