diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/entity/account/UserEntity.java b/eiam-common/src/main/java/cn/topiam/employee/common/entity/account/UserEntity.java index b142aa8d..690905bc 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/entity/account/UserEntity.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/entity/account/UserEntity.java @@ -187,7 +187,7 @@ public class UserEntity extends LogicDeleteEntity { */ @Transient @JsonIgnore - private String plaintext; + private String passwordPlainText; @Override public boolean equals(Object o) { diff --git a/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/UserRepositoryCustomizedImpl.java b/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/UserRepositoryCustomizedImpl.java index fdbae975..28615238 100644 --- a/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/UserRepositoryCustomizedImpl.java +++ b/eiam-common/src/main/java/cn/topiam/employee/common/repository/account/impl/UserRepositoryCustomizedImpl.java @@ -69,7 +69,7 @@ public class UserRepositoryCustomizedImpl implements UserRepositoryCustomized { @Override public Page getUserList(UserListQuery query, Pageable pageable) { //@formatter:off - StringBuilder builder = new StringBuilder("SELECT `user`.id_, `user`.username_,`user`.password_, `user`.email_, `user`.phone_,`user`.phone_area_code, `user`.full_name ,`user`.nick_name, `user`.avatar_ , `user`.status_, `user`.data_origin, `user`.email_verified, `user`.phone_verified, `user`.auth_total, `user`.last_auth_ip, `user`.last_auth_time, `user`.expand_, `user`.external_id , `user`.expire_date,`user`.create_by, `user`.create_time, `user`.update_by , `user`.update_time, `user`.remark_, group_concat( IF(organization_member.primary_ = 1, null, organization_.display_path ) ) AS primary_org_display_path, group_concat( IF(organization_member.primary_ IS NULL, null, organization_.display_path ) ) AS org_display_path FROM `user` INNER JOIN `organization_member` ON (`user`.id_ = organization_member.user_id) INNER JOIN `organization` organization_ ON (organization_.id_ = organization_member.org_id) WHERE `user`.is_deleted = 0"); + StringBuilder builder = new StringBuilder("SELECT `user`.id_, `user`.username_, `user`.password_, `user`.email_, `user`.phone_, `user`.phone_area_code, `user`.full_name, `user`.nick_name, `user`.avatar_, `user`.status_, `user`.data_origin, `user`.email_verified, `user`.phone_verified, `user`.auth_total, `user`.last_auth_ip, `user`.last_auth_time, `user`.expand_, `user`.external_id, `user`.expire_date, `user`.create_by, `user`.create_time, `user`.update_by, `user`.update_time, `user`.remark_, group_concat( IF( organization_member.primary_ = TRUE, organization_.display_path, NULL) ) AS primary_org_display_path, group_concat( IF ( organization_member.primary_ IS NULL, organization_.display_path, NULL ) ) AS org_display_path FROM `user` INNER JOIN `organization_member` ON ( `user`.id_ = organization_member.user_id ) INNER JOIN `organization` organization_ ON ( organization_.id_ = organization_member.org_id ) WHERE `user`.is_deleted = 0 AND organization_member.is_deleted = 0 "); //组织条件 if (StringUtils.isNotBlank(query.getOrganizationId())) { if (Boolean.TRUE.equals(query.getInclSubOrganization())) { diff --git a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx index 40fc64a8..40db28ee 100644 --- a/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx +++ b/eiam-console/src/main/console-fe/src/pages/account/UserList/components/User/User.tsx @@ -184,44 +184,53 @@ export default (props: UserListProps) => { dataIndex: 'orgDisplayPath', search: false, ellipsis: true, - render: (_, record) => [ - - {record.primaryOrgDisplayPath} - - } - content={ - - {record.orgDisplayPath.split(',')?.map((p: string) => { - return ( - - {p} - - ); - })} - - } - > - - { - - {record.primaryOrgDisplayPath} - - } - - - {record.orgDisplayPath.split(',')?.map((p: string) => { - return ( - - {p} + render: (_, record) => { + console.log(record.primaryOrgDisplayPath); + return ( + + {record.primaryOrgDisplayPath} - ); - })} - - , - ], + ) + } + content={ + + {record.orgDisplayPath?.split(',')?.map((p: string) => { + return ( + + {p} + + ); + })} + + } + > + {record.primaryOrgDisplayPath && ( + + { + + {record.primaryOrgDisplayPath} + + } + + )} + {record.orgDisplayPath && ( + + {record.orgDisplayPath?.split(',')?.map((p: string) => { + return ( + + {p} + + ); + })} + + )} + + ); + }, }, { title: intl.formatMessage({ id: 'pages.account.user_list.user.columns.status' }), diff --git a/eiam-console/src/main/console-fe/src/services/typings.d.ts b/eiam-console/src/main/console-fe/src/services/typings.d.ts index e6d00ec2..23b544fe 100644 --- a/eiam-console/src/main/console-fe/src/services/typings.d.ts +++ b/eiam-console/src/main/console-fe/src/services/typings.d.ts @@ -181,6 +181,7 @@ declare namespace AccountAPI { dataOrigin: string; authTotal: string; lastAuthTime: string; + primaryOrgDisplayPath: string; orgDisplayPath: string; remark: string; custom?: Record; diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/synchronizer/processor/AbstractIdentitySourcePostProcessor.java b/eiam-console/src/main/java/cn/topiam/employee/console/synchronizer/processor/AbstractIdentitySourcePostProcessor.java index 481f45ad..2daeca3b 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/synchronizer/processor/AbstractIdentitySourcePostProcessor.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/synchronizer/processor/AbstractIdentitySourcePostProcessor.java @@ -178,7 +178,7 @@ public class AbstractIdentitySourcePostProcessor { entity.setDataOrigin(dataOrigin); entity.setIdentitySourceId(identitySource.getId()); entity.setPassword(passwordEncoder.encode(defaultPassword)); - entity.setPlaintext(defaultPassword); + entity.setPasswordPlainText(defaultPassword); //必须字段 entity.setCreateBy(SYSTEM_DEFAULT_USER_NAME); @@ -302,14 +302,14 @@ public class AbstractIdentitySourcePostProcessor { thirdPartyUser.getEmail(), thirdPartyUser.getPhone()); if (StringUtils.isNotEmpty(thirdPartyUser.getEmail())) { Map parameter = new HashMap<>(16); - parameter.put(MsgVariable.PASSWORD, thirdPartyUser.getPlaintext()); + parameter.put(MsgVariable.PASSWORD, thirdPartyUser.getPasswordPlainText()); mailMsgEventPublish.publish(MailType.RESET_PASSWORD_CONFIRM, thirdPartyUser.getEmail(), parameter); } if (StringUtils.isNotEmpty(thirdPartyUser.getPhone())) { LinkedHashMap parameter = new LinkedHashMap<>(); parameter.put(USERNAME, thirdPartyUser.getUsername()); - parameter.put(MsgVariable.PASSWORD, thirdPartyUser.getPlaintext()); + parameter.put(MsgVariable.PASSWORD, thirdPartyUser.getPasswordPlainText()); smsMsgEventPublish.publish(SmsType.RESET_PASSWORD_SUCCESS, thirdPartyUser.getPhone(), parameter); } diff --git a/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/request/UpdateUserInfoRequest.java b/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/request/UpdateUserInfoRequest.java index 9cd30b15..ddddb668 100644 --- a/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/request/UpdateUserInfoRequest.java +++ b/eiam-portal/src/main/java/cn/topiam/employee/portal/pojo/request/UpdateUserInfoRequest.java @@ -48,12 +48,6 @@ public class UpdateUserInfoRequest implements Serializable { @Schema(description = "昵称") private String nickName; - /** - * 个人简介 - */ - @Schema(description = "个人简介") - private String personalProfile; - /** * 头像 */