feat:用户删除、离职操作

qdlgxiemaosheng
1 parent e7cdb247
Showing 8 changed files with 56 additions and 2 deletions
src/main/java/com/order/erp/controller/UserController.java
src/main/java/com/order/erp/domain/vo/UserVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserQueryVO.java
src/main/java/com/order/erp/domain/vo/admin/AdminUserResultVO.java
src/main/java/com/order/erp/security/service/UserDetailsServiceImpl.java
src/main/java/com/order/erp/security/vo/JwtUser.java
src/main/java/com/order/erp/service/admin/AdminUserService.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
@@ -80,6 +80,14 @@ public class UserController {
         return userService.deleteById(queryVO);
     }
  
+    @Log("禁用用户")
+    @ApiOperation("禁用用户")
+    @PostMapping(value = "/opt")
+    @AnonymousAccess
+    public ServerResult opt(@RequestBody @Validated AdminUserQueryVO queryVO) {
+        return userService.deleteById(queryVO);
+    }
+
     @Log("修改密码")
     @ApiOperation("修改密码")
     @PostMapping(value = "/update_pass")
@@ -9,7 +9,6 @@ import lombok.Data;
  
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.Date;
 import java.util.Set;
  
  
@@ -50,6 +49,11 @@ public class UserVO implements Serializable {
  
     private Boolean enabled;
  
+    /**
+     * 是否可用 10-可用 20-删除 30-禁用
+     */
+    private Integer enableFlag;
+
     @JsonIgnore
     private String password;
  
@@ -24,6 +24,10 @@ public class AdminUserQueryVO extends BasePageVO implements Serializable {
  
     private List<Long> ids;
  
+    /**
+     * 10:启用，20：删除，30：禁用
+     */
+    private Integer optType;
  
     private Long id;
     /**
 package com.order.erp.domain.vo.admin;
  
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
  
@@ -97,4 +100,9 @@ public class AdminUserResultVO implements Serializable {
      */
     private String remark;
  
+    /**
+     * 是否可用 10-可用 20-删除 30-禁用
+     */
+    private Integer enableFlag;
+
 }
@@ -66,6 +66,7 @@ public class UserDetailsServiceImpl implements UserDetailsService {
                 Optional.ofNullable(user.getJob()).map(JobSmallVO::getName).orElse(null),
                 roleService.mapToGrantedAuthorities(user),
                 user.getEnabled(),
+                user.getEnableFlag(),
                 user.getCreateTime(),
                 buildRoleSmall(user),
                 user.getPwdResetTime()
@@ -44,6 +44,11 @@ public class JwtUser implements UserDetails {
  
     private final boolean enabled;
  
+    /**
+     * 是否可用 10-可用 20-删除 30-禁用
+     */
+    private Integer enableFlag;
+
     private LocalDateTime createTime;
  
     private AdminRoleSmallVO roleSmallVO;
@@ -63,6 +63,13 @@ public interface AdminUserService extends IService&lt;AdminUserDO&gt; {
  
     /**
      *
+     * @param adminUserQueryVO
+     * @return
+     */
+    ServerResult opt(AdminUserQueryVO adminUserQueryVO);
+
+    /**
+     *
      * @param userName
      * @return
      */
@@ -302,6 +302,23 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         return ServerResult.success(result.get());
     }
  
+    @Override
+    public ServerResult opt(AdminUserQueryVO adminUserQueryVO) {
+        List<Long> ids = adminUserQueryVO.getIds();
+        if (CollUtil.isEmpty(ids)) {
+            return ServerResult.fail("ids 参数不能为空");
+        }
+        List<AdminUserDO> adminUserList = listByIds(ids);
+        if (CollUtil.isEmpty(adminUserList)) {
+            return ServerResult.success();
+        }
+        LambdaUpdateWrapper<AdminUserDO> updateWrapper = new LambdaUpdateWrapper<AdminUserDO>()
+                .in(AdminUserDO::getId, ids)
+                .set(AdminUserDO::getEnableFlag, adminUserQueryVO.getOptType());
+        update(updateWrapper);
+        return ServerResult.success();
+    }
+
     /**
      * 通过主键删除数据
      *
@@ -329,7 +346,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     @Override
     public UserVO findByUserName(String userName) {
         AdminUserDO userDO = getOne(new LambdaQueryWrapper<AdminUserDO>()
-                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .in(BaseDO::getEnableFlag, Arrays.asList(Constant.ENABLE_TEN, Constant.THIRTY))
                 .and(q -> q.eq(AdminUserDO::getUserName, userName).or().eq(AdminUserDO::getPhone, userName))
                 .last("limit 1"));
         if (Objects.isNull(userDO)) {