From 575e4a681b1b8754902886af92dc23e145015d67 Mon Sep 17 00:00:00 2001 From: awenes <1121353141@qq.com> Date: Thu, 5 Oct 2023 11:34:43 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/account/UserController.java | 18 ------------- .../pojo/result/account/UserListResult.java | 2 +- .../console/service/account/UserService.java | 9 ------- .../account/impl/UserGroupServiceImpl.java | 3 +++ .../service/account/impl/UserServiceImpl.java | 25 ++----------------- 5 files changed, 6 insertions(+), 51 deletions(-) diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/controller/account/UserController.java b/eiam-console/src/main/java/cn/topiam/employee/console/controller/account/UserController.java index a0e3111c..08d36dc3 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/controller/account/UserController.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/controller/account/UserController.java @@ -226,24 +226,6 @@ public class UserController { return ApiRestResult. builder().result(result).build(); } - /** - * 用户转岗 - * - * @param userId {@link String} - * @param orgId {@link String} - * @return {@link Boolean} - */ - @Lock - @Preview - @Operation(summary = "用户转岗") - @PutMapping(value = "/transfer") - @PreAuthorize(value = "authenticated and @sae.hasAuthority(T(cn.topiam.employee.support.security.userdetails.UserType).ADMIN)") - public ApiRestResult userTransfer(@Parameter(description = "用户ID") @NotBlank(message = "用户ID不能为空") String userId, - @Parameter(description = "组织ID") @NotBlank(message = "组织ID不能为空") String orgId) { - return ApiRestResult. builder().result(userService.userTransfer(userId, orgId)) - .build(); - } - /** * 用户离职 * diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/account/UserListResult.java b/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/account/UserListResult.java index 9a6505cf..50e30edd 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/account/UserListResult.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/pojo/result/account/UserListResult.java @@ -126,7 +126,7 @@ public class UserListResult implements Serializable { * 主组织目录 */ @Parameter(description = "主组织机构目录") - private String primaryOrgDisplayPath; + private String primaryOrgDisplayPath; /** * 最后修改密码时间 diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/service/account/UserService.java b/eiam-console/src/main/java/cn/topiam/employee/console/service/account/UserService.java index ac20e67f..5e238b88 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/service/account/UserService.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/service/account/UserService.java @@ -120,15 +120,6 @@ public interface UserService { */ boolean deleteUser(String id); - /** - * 用户转岗 - * - * @param userId {@link String} - * @param orgId {@link String} - * @return {@link Boolean} - */ - Boolean userTransfer(String userId, String orgId); - /** * 批量删除用户 * diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserGroupServiceImpl.java b/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserGroupServiceImpl.java index b24d5fe1..e06ab4b6 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserGroupServiceImpl.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserGroupServiceImpl.java @@ -36,6 +36,9 @@ import cn.topiam.employee.audit.context.AuditContext; import cn.topiam.employee.audit.entity.Target; import cn.topiam.employee.audit.enums.TargetType; import cn.topiam.employee.common.entity.account.*; +import cn.topiam.employee.common.entity.account.QUserEntity; +import cn.topiam.employee.common.entity.account.QUserGroupEntity; +import cn.topiam.employee.common.entity.account.QUserGroupMemberEntity; import cn.topiam.employee.common.entity.account.po.UserPO; import cn.topiam.employee.common.entity.account.query.UserGroupMemberListQuery; import cn.topiam.employee.common.repository.account.UserGroupMemberRepository; diff --git a/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserServiceImpl.java b/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserServiceImpl.java index c7ee4f65..08cb59ff 100644 --- a/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserServiceImpl.java +++ b/eiam-console/src/main/java/cn/topiam/employee/console/service/account/impl/UserServiceImpl.java @@ -44,6 +44,7 @@ import cn.topiam.employee.audit.entity.Target; import cn.topiam.employee.audit.enums.TargetType; import cn.topiam.employee.audit.repository.AuditRepository; import cn.topiam.employee.common.entity.account.*; +import cn.topiam.employee.common.entity.account.QUserEntity; import cn.topiam.employee.common.entity.account.po.UserPO; import cn.topiam.employee.common.entity.account.query.UserListNotInGroupQuery; import cn.topiam.employee.common.entity.account.query.UserListQuery; @@ -389,28 +390,6 @@ public class UserServiceImpl implements UserService { return true; } - /** - * 用户转岗 - * - * @param userId {@link String} - * @param orgId {@link String} - * @return {@link Boolean} - */ - @Override - public Boolean userTransfer(String userId, String orgId) { - Optional entity = organizationRepository.findById(orgId); - //additionalContent - if (entity.isEmpty()) { - AuditContext.setContent("操作失败，组织不存在"); - log.warn(AuditContext.getContent()); - throw new TopIamException(AuditContext.getContent()); - } - organizationMemberRepository.deleteByOrgIdAndUserId(orgId, Long.valueOf(userId)); - userRepository.save(null); - AuditContext.setTarget(Target.builder().id(userId).type(TargetType.USER).build()); - return true; - } - /** * 批量删除用户 * @@ -504,7 +483,7 @@ public class UserServiceImpl implements UserService { // 字段排序 OrderSpecifier order = QAuditEntity.auditEntity.eventTime.desc(); for (PageModel.Sort sort : pageModel.getSorts()) { - if (org.apache.commons.lang3.StringUtils.equals(sort.getSorter(), SORT_EVENT_TIME)) { + if (StringUtils.equals(sort.getSorter(), SORT_EVENT_TIME)) { if (sort.getAsc()) { order = QAuditEntity.auditEntity.eventTime.asc(); }