diff --git a/modules/core/db/core.erm b/modules/core/db/core.erm index 397f1862..ff720312 100644 --- a/modules/core/db/core.erm +++ b/modules/core/db/core.erm @@ -12,7 +12,7 @@ 0 1.0 18 - 2101 + 396 128 128 @@ -7114,414 +7114,6 @@ - - 26e4b2554a744e584fba5f3b88c267026359e727 - 438 - 383 - Segoe UI - 9 - 515 - 468 - - 128 - 128 - 192 - - - - dc62d8a8ae47139bde65fdea22fb08ec869cb5ba - e358008a1c9b84f744e89039339ba56765fe34bd - 26e4b2554a744e584fba5f3b88c267026359e727 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 0..1 - true - - RESTRICT - RESTRICT - null - null - - - a879d42851b5e1de227ec1be77e5e9829bf3e554 - f24ec280de439487a7e35a62e11a445e7adbd9b6 - 26e4b2554a744e584fba5f3b88c267026359e727 - -1 - -1 - -1 - -1 - - 0 - 0 - 0 - - 1..n - 1 - true - - RESTRICT - RESTRICT - null - null - - - js_sys_employee - 员工表 - - - - - - - 0eb719cd3d6524bc3778d73c3634c1b976baa3c7 - ab8b402ea35a78cdadd5ed446d571c9a80b532ee - - - - - varchar(n) - - - false - false - true - true - false - - - - - - - - - - - false - false - false - - - 0 - - - - 125f4be73b069fa39d11d391ebc30169bb835827 - e0ee6264e4415cc7d534335a38f6dbec62822900 - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 8e6503837a4993eab7dd018391909b3a9185f0bd - 28440c39441334f1eacbfa49440ebfc746edbada - - - - - varchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c - 512f24dbe486a211117dfb58e689ef3e0e5009a0 - a879d42851b5e1de227ec1be77e5e9829bf3e554 - - - - - varchar(n) - - - false - true - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 2b8439b512c0d6df70ca5f7c65bfd30a32def655 - 2f53aa3a1613598e128ad9cab02374b32d9bf70b - - - - - nvarchar(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d - 5ac7f3a7a755a58e6119c8d4922df644559e632f - dc62d8a8ae47139bde65fdea22fb08ec869cb5ba - - - - - varchar(n) - - - false - true - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - f0f47249781a8c1e655ae11236426b788f099fce - 653e75ecac41402f2d2bcea19230b9cb17536776 - - - - - nvarchar(n) - - - false - false - false - false - false - - - - - - - - - - - false - false - false - - - 0 - - - - cf949a5f8d12902f0a8384fa68c72f55e6136812 - ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b - - - - - character(n) - - - false - false - true - false - false - - - - - - - - - - - false - false - false - - - 0 - - - 85024a2953cf3e3c9c1cce49b2351853ab0d125b - ea920cba2fe0eaee64a2310ece7cda4b198b37ec - - - - false - true - idx_sys_employee_cco - - - - - 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d - false - - - - - false - true - idx_sys_employee_cc - - - - - b8ea4b73d6d32a222e5abfd453287575ae518480 - false - - - - - false - true - idx_sys_employee_ud - - - - - ee78b079f7d319bf8119fd01439cd97424ff49fa - false - - - - - false - true - idx_sys_employee_oc - - - - - b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c - false - - - - - false - true - idx_sys_employee_status - - - - - ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b - false - - - - - - - - - -
0ded13a505cc3bfde24edfbae369231be192a59b1283 @@ -15245,8 +14837,8 @@ falsefalsetrue - false - true + true + false @@ -15279,7 +14871,7 @@ false true true - true + false false @@ -15313,7 +14905,7 @@ false true true - true + false false @@ -16696,6 +16288,414 @@
+ + 26e4b2554a744e584fba5f3b88c267026359e727 + 438 + 383 + Segoe UI + 9 + 515 + 468 + + 128 + 128 + 192 + + + + dc62d8a8ae47139bde65fdea22fb08ec869cb5ba + e358008a1c9b84f744e89039339ba56765fe34bd + 26e4b2554a744e584fba5f3b88c267026359e727 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 0..1 + true + + RESTRICT + RESTRICT + null + null + + + a879d42851b5e1de227ec1be77e5e9829bf3e554 + f24ec280de439487a7e35a62e11a445e7adbd9b6 + 26e4b2554a744e584fba5f3b88c267026359e727 + -1 + -1 + -1 + -1 + + 0 + 0 + 0 + + 1..n + 1 + true + + RESTRICT + RESTRICT + null + null + + + js_sys_employee + 员工表 + + + + + + + 0eb719cd3d6524bc3778d73c3634c1b976baa3c7 + ab8b402ea35a78cdadd5ed446d571c9a80b532ee + + + + + varchar(n) + + + false + false + true + true + false + + + + + + + + + + + false + false + false + + + 0 + + + + 125f4be73b069fa39d11d391ebc30169bb835827 + e0ee6264e4415cc7d534335a38f6dbec62822900 + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 8e6503837a4993eab7dd018391909b3a9185f0bd + 28440c39441334f1eacbfa49440ebfc746edbada + + + + + varchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c + 512f24dbe486a211117dfb58e689ef3e0e5009a0 + a879d42851b5e1de227ec1be77e5e9829bf3e554 + + + + + varchar(n) + + + false + true + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 2b8439b512c0d6df70ca5f7c65bfd30a32def655 + 2f53aa3a1613598e128ad9cab02374b32d9bf70b + + + + + nvarchar(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d + 5ac7f3a7a755a58e6119c8d4922df644559e632f + dc62d8a8ae47139bde65fdea22fb08ec869cb5ba + + + + + varchar(n) + + + false + true + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + f0f47249781a8c1e655ae11236426b788f099fce + 653e75ecac41402f2d2bcea19230b9cb17536776 + + + + + nvarchar(n) + + + false + false + false + false + false + + + + + + + + + + + false + false + false + + + 0 + + + + cf949a5f8d12902f0a8384fa68c72f55e6136812 + ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b + + + + + character(n) + + + false + false + true + false + false + + + + + + + + + + + false + false + false + + + 0 + + + 85024a2953cf3e3c9c1cce49b2351853ab0d125b + ea920cba2fe0eaee64a2310ece7cda4b198b37ec + + + + false + true + idx_sys_employee_cco + + + + + 76ab6ac096fb9c9be7bf61df683ce21a3da0c33d + false + + + + + false + true + idx_sys_employee_cc + + + + + b8ea4b73d6d32a222e5abfd453287575ae518480 + false + + + + + false + true + idx_sys_employee_ud + + + + + ee78b079f7d319bf8119fd01439cd97424ff49fa + false + + + + + false + true + idx_sys_employee_oc + + + + + b0ac1bfb9a465a46257d8e043e8d0370feb0ee7c + false + + + + + false + true + idx_sys_employee_status + + + + + ebe0900f7c091a4c0c47ec7fb29f4a9d586cf74b + false + + + + + + + + + +
diff --git a/modules/core/db/db2/core.sql b/modules/core/db/db2/core.sql index 532ab004..9dc74538 100644 --- a/modules/core/db/db2/core.sql +++ b/modules/core/db/db2/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/modules/core/db/mssql/core.sql b/modules/core/db/mssql/core.sql index ad978cba..2b71afdf 100644 --- a/modules/core/db/mssql/core.sql +++ b/modules/core/db/mssql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE [js_sys_employee] -- 员工附属机构关系表 CREATE TABLE [js_sys_employee_office] ( - [id] varchar(64) NOT NULL UNIQUE, + [id] varchar(64) NOT NULL, [emp_code] varchar(64) NOT NULL, [office_code] varchar(64) NOT NULL, [post_code] varchar(64), - PRIMARY KEY ([emp_code], [office_code]) + PRIMARY KEY ([id]) ); diff --git a/modules/core/db/mysql/core.sql b/modules/core/db/mysql/core.sql index 0189f345..f4ffda79 100644 --- a/modules/core/db/mysql/core.sql +++ b/modules/core/db/mysql/core.sql @@ -285,8 +285,7 @@ CREATE TABLE js_sys_employee_office emp_code varchar(64) NOT NULL COMMENT '员工编码', office_code varchar(64) NOT NULL COMMENT '机构编码', post_code varchar(64) COMMENT '岗位编码', - PRIMARY KEY (emp_code, office_code), - UNIQUE (id) + PRIMARY KEY (id) ) COMMENT = '员工附属机构关系表'; diff --git a/modules/core/db/oracle/core.sql b/modules/core/db/oracle/core.sql index f34f7f1e..af67d1ef 100644 --- a/modules/core/db/oracle/core.sql +++ b/modules/core/db/oracle/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar2(64) NOT NULL UNIQUE, + id varchar2(64) NOT NULL, emp_code varchar2(64) NOT NULL, office_code varchar2(64) NOT NULL, post_code varchar2(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/modules/core/db/postgresql/core.sql b/modules/core/db/postgresql/core.sql index 4a591dfe..41993b68 100644 --- a/modules/core/db/postgresql/core.sql +++ b/modules/core/db/postgresql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ) WITHOUT OIDS; 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 e7d99626..76ccd07e 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/web/db/db2/core.sql b/web/db/db2/core.sql index 532ab004..9dc74538 100644 --- a/web/db/db2/core.sql +++ b/web/db/db2/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/web/db/mssql/core.sql b/web/db/mssql/core.sql index ad978cba..2b71afdf 100644 --- a/web/db/mssql/core.sql +++ b/web/db/mssql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE [js_sys_employee] -- 员工附属机构关系表 CREATE TABLE [js_sys_employee_office] ( - [id] varchar(64) NOT NULL UNIQUE, + [id] varchar(64) NOT NULL, [emp_code] varchar(64) NOT NULL, [office_code] varchar(64) NOT NULL, [post_code] varchar(64), - PRIMARY KEY ([emp_code], [office_code]) + PRIMARY KEY ([id]) ); diff --git a/web/db/mysql/core.sql b/web/db/mysql/core.sql index 0189f345..f4ffda79 100644 --- a/web/db/mysql/core.sql +++ b/web/db/mysql/core.sql @@ -285,8 +285,7 @@ CREATE TABLE js_sys_employee_office emp_code varchar(64) NOT NULL COMMENT '员工编码', office_code varchar(64) NOT NULL COMMENT '机构编码', post_code varchar(64) COMMENT '岗位编码', - PRIMARY KEY (emp_code, office_code), - UNIQUE (id) + PRIMARY KEY (id) ) COMMENT = '员工附属机构关系表'; diff --git a/web/db/oracle/core.sql b/web/db/oracle/core.sql index f34f7f1e..af67d1ef 100644 --- a/web/db/oracle/core.sql +++ b/web/db/oracle/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar2(64) NOT NULL UNIQUE, + id varchar2(64) NOT NULL, emp_code varchar2(64) NOT NULL, office_code varchar2(64) NOT NULL, post_code varchar2(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ); diff --git a/web/db/postgresql/core.sql b/web/db/postgresql/core.sql index 4a591dfe..41993b68 100644 --- a/web/db/postgresql/core.sql +++ b/web/db/postgresql/core.sql @@ -280,11 +280,11 @@ CREATE TABLE js_sys_employee -- 员工附属机构关系表 CREATE TABLE js_sys_employee_office ( - id varchar(64) NOT NULL UNIQUE, + id varchar(64) NOT NULL, emp_code varchar(64) NOT NULL, office_code varchar(64) NOT NULL, post_code varchar(64), - PRIMARY KEY (emp_code, office_code) + PRIMARY KEY (id) ) WITHOUT OIDS;