⚡ 优化代码

eiam-console/src/main/java/cn/topiam/employee/console/controller/account/UserController.java

@@ -226,24 +226,6 @@ public class UserController {
         return ApiRestResult.<Boolean> 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<Boolean> userTransfer(@Parameter(description = "用户ID") @NotBlank(message = "用户ID不能为空") String userId,
-                                               @Parameter(description = "组织ID") @NotBlank(message = "组织ID不能为空") String orgId) {
-        return ApiRestResult.<Boolean> builder().result(userService.userTransfer(userId, orgId))
-            .build();
-    }
-
     /**
      * 用户离职
      *

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;
 
     /**
      * 最后修改密码时间

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);
-
     /**
      * 批量删除用户
      *

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;

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<OrganizationEntity> 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<LocalDateTime> 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();
                 }