diff --git a/iam-base-starter/src/main/java/com/diboot/iam/entity/IamUser.java b/iam-base-starter/src/main/java/com/diboot/iam/entity/IamUser.java index b7d3b1a..061f509 100644 --- a/iam-base-starter/src/main/java/com/diboot/iam/entity/IamUser.java +++ b/iam-base-starter/src/main/java/com/diboot/iam/entity/IamUser.java @@ -39,10 +39,6 @@ public class IamUser extends BaseExtEntity { @TableField() private Long orgId; - @NotNull(message = "汇报上级ID不能为空") - @TableField() - private Long reportManagerId; - @NotNull(message = "用户编号不能为空") @Length(max=20, message="用户编号长度应小于50") @TableField() diff --git a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mariadb.sql b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mariadb.sql index e42f4af..8c3c489 100644 --- a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mariadb.sql +++ b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mariadb.sql @@ -4,7 +4,6 @@ create table iam_user id bigint auto_increment comment 'ID' primary key, org_id bigint default 0 not null comment '组织ID', user_num varchar(20) not null comment '用户编号', - report_manager_id bigint default 0 not null comment '汇报上级ID', realname varchar(50) not null comment '真实姓名', gender varchar(10) not null comment '性别', birthdate date null comment '出生日期', @@ -19,7 +18,6 @@ create table iam_user -- 索引 create index idx_iam_user_1 on iam_user (org_id); create index idx_iam_user_2 on iam_user (mobile_phone); -create index idx_iam_user_3 on iam_user (report_manager_id); create unique index uidx_iam_user on iam_user (user_num); -- 账号表 diff --git a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mysql.sql b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mysql.sql index bf0fcde..7c71061 100644 --- a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mysql.sql +++ b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-mysql.sql @@ -4,7 +4,6 @@ create table iam_user id bigint auto_increment comment 'ID' primary key, org_id bigint default 0 not null comment '组织ID', user_num varchar(20) not null comment '用户编号', - report_manager_id bigint default 0 not null comment '汇报上级ID', realname varchar(50) not null comment '真实姓名', gender varchar(10) not null comment '性别', birthdate date null comment '出生日期', @@ -19,7 +18,6 @@ create table iam_user -- 索引 create index idx_iam_user_1 on iam_user (org_id); create index idx_iam_user_2 on iam_user (mobile_phone); -create index idx_iam_user_3 on iam_user (report_manager_id); create unique index uidx_iam_user on iam_user (user_num); -- 账号表 diff --git a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-oracle.sql b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-oracle.sql index 9249da6..368a123 100644 --- a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-oracle.sql +++ b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-oracle.sql @@ -3,7 +3,6 @@ create table ${SCHEMA}.iam_user ( id NUMBER(20) generated as identity ( start with 100000 nocycle noorder), org_id NUMBER(20) default 0 not null, - report_manager_id NUMBER(20) default 0 not null, user_num VARCHAR2(20) not null, realname VARCHAR2(50) not null, gender VARCHAR2(10) not null, @@ -21,7 +20,6 @@ create table ${SCHEMA}.iam_user comment on column ${SCHEMA}.iam_user.id is 'ID'; comment on column ${SCHEMA}.iam_user.org_id is '组织ID'; comment on column ${SCHEMA}.iam_user.user_num is '用户编号'; -comment on column ${SCHEMA}.iam_user.report_manager_id is '汇报上级ID'; comment on column ${SCHEMA}.iam_user.realname is '真实姓名'; comment on column ${SCHEMA}.iam_user.gender is '性别'; comment on column ${SCHEMA}.iam_user.birthdate is '出生日期'; @@ -36,7 +34,6 @@ comment on table ${SCHEMA}.iam_user is '系统用户'; -- 索引 create index idx_iam_user_1 on ${SCHEMA}.iam_user (org_id); create index idx_iam_user_2 on ${SCHEMA}.iam_user (mobile_phone); -create index idx_iam_user_3 on ${SCHEMA}.iam_user (report_manager_id); create unique index uidx_iam_user on ${SCHEMA}.iam_user (user_num); -- 账号表 diff --git a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-postgresql.sql b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-postgresql.sql index d29ebc9..39e231d 100644 --- a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-postgresql.sql +++ b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-postgresql.sql @@ -3,7 +3,6 @@ create table iam_user ( id bigserial not null, org_id bigint not null default 0, - report_manager_id bigint not null default 0, user_num varchar(20) not null, realname varchar(50) not null, gender varchar(10) not null, @@ -20,7 +19,6 @@ create table iam_user comment on column iam_user.id is 'ID'; comment on column iam_user.org_id is '组织ID'; comment on column iam_user.user_num is '用户编号'; -comment on column iam_user.report_manager_id is '汇报上级ID'; comment on column iam_user.realname is '真实姓名'; comment on column iam_user.gender is '性别'; comment on column iam_user.birthdate is '出生日期'; @@ -35,7 +33,6 @@ comment on table iam_user is '系统用户'; -- 索引 create index idx_iam_user_1 on iam_user (org_id); create index idx_iam_user_2 on iam_user (mobile_phone); -create index idx_iam_user_3 on iam_user (report_manager_id); create unique index uidx_iam_user on iam_user (user_num); -- 账号表 diff --git a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-sqlserver.sql b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-sqlserver.sql index 84f66e5..ceaa4c5 100644 --- a/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-sqlserver.sql +++ b/iam-base-starter/src/main/resources/META-INF/sql/init-iam-base-sqlserver.sql @@ -4,7 +4,6 @@ create table ${SCHEMA}.iam_user id bigint identity, org_id bigint not null default 0, user_num varchar(20) not null, - report_manager_id bigint not null default 0, realname varchar(50) not null, gender varchar(10) not null, birthdate date null, @@ -21,7 +20,6 @@ create table ${SCHEMA}.iam_user execute sp_addextendedproperty 'MS_Description', N'ID', 'SCHEMA', '${SCHEMA}', 'table', iam_user, 'column', 'id'; execute sp_addextendedproperty 'MS_Description', N'组织ID', 'SCHEMA', '${SCHEMA}', 'table', iam_user, 'column', 'org_id'; execute sp_addextendedproperty 'MS_Description', N'用户编号', 'SCHEMA', '${SCHEMA}', 'table', iam_user, 'column', 'user_num'; -execute sp_addextendedproperty 'MS_Description', N'汇报上级ID', 'SCHEMA', '${SCHEMA}', 'table', iam_user, 'column', 'report_manager_id'; execute sp_addextendedproperty 'MS_Description', N'真实姓名', 'SCHEMA', '${SCHEMA}', 'table', iam_user, 'column', 'realname'; execute sp_addextendedproperty 'MS_Description', N'性别', 'SCHEMA', '${SCHEMA}', 'table', iam_user, 'column', 'gender'; execute sp_addextendedproperty 'MS_Description', N'出生日期', 'SCHEMA', '${SCHEMA}', 'table', iam_user, 'column', 'birthdate'; @@ -36,7 +34,6 @@ execute sp_addextendedproperty 'MS_Description', N'系统用户', 'SCHEMA', '${S -- 索引 create index idx_iam_user_1 on iam_user (org_id); create index idx_iam_user_2 on iam_user (mobile_phone); -create index idx_iam_user_3 on iam_user (report_manager_id); create unique index uidx_iam_user on iam_user (user_num); -- 账号表