feat:用户删除、离职操作

qdlgxiemaosheng
1 parent 623c9701
Showing 4 changed files with 17 additions and 5 deletions
sql/dml_20231224.sql
src/main/java/com/order/erp/controller/UserController.java
src/main/java/com/order/erp/domain/dto/admin/AdminUserDO.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
+alter table `admin_user` add column  `status` DOUBLE DEFAULT 10 COMMENT '状态 10 正常，20 禁用';
@@ -85,7 +85,7 @@ public class UserController {
     @PostMapping(value = "/opt")
     @AnonymousAccess
     public ServerResult opt(@RequestBody @Validated AdminUserQueryVO queryVO) {
-        return userService.deleteById(queryVO);
+        return userService.opt(queryVO);
     }
     @Log("修改密码")
@@ -88,4 +88,9 @@ public class AdminUserDO extends BaseDO implements Serializable {
      */
     private String remark;
+    /**
+     * 10，正常，20:禁用
+     */
+    private Integer status;
+
 }
@@ -164,6 +164,7 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
     private LambdaQueryWrapper<AdminUserDO> buildQueryByParam(AdminUserQueryVO queryVO) {
         return new LambdaQueryWrapper<AdminUserDO>()
                 .in(BaseDO::getEnableFlag, Arrays.asList(Constant.ENABLE_TEN, Constant.THIRTY))
+                .eq(AdminUserDO::getStatus, Constant.ENABLE_TEN)
                 .eq(StringUtils.isNotBlank(queryVO.getUserName()), AdminUserDO::getUserName, queryVO.getUserName())
                 .eq(StringUtils.isNotBlank(queryVO.getNickName()), AdminUserDO::getNickName, queryVO.getNickName())
                 .eq(StringUtils.isNotBlank(queryVO.getPhone()), AdminUserDO::getPhone, queryVO.getPhone())
@@ -312,9 +313,12 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if (CollUtil.isEmpty(adminUserList)) {
             return ServerResult.success();
         }
-        LambdaUpdateWrapper<AdminUserDO> updateWrapper = new LambdaUpdateWrapper<AdminUserDO>()
-                .in(AdminUserDO::getId, ids)
-                .set(AdminUserDO::getEnableFlag, adminUserQueryVO.getOptType());
+        LambdaUpdateWrapper<AdminUserDO> updateWrapper = new LambdaUpdateWrapper<>();
+        if (adminUserQueryVO.getOptType() == Constant.THIRTY) {
+            updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getStatus, Constant.UNABLE_TWENTY);
+        } else {
+            updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getEnableFlag, adminUserQueryVO.getOptType());
+        }
         update(updateWrapper);
         return ServerResult.success();
     }
@@ -463,7 +467,9 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         if (!modifyPwdVO.getPassword().equals(modifyPwdVO.getConfirmPassword())) {
             throw new BusinessException(ServerResultCode.MEMBER_CONFIRM_PASSWORD_ERROR);
         }
-        AdminUserDO userDO = getOne(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+        AdminUserDO userDO = getOne(new LambdaQueryWrapper<AdminUserDO>()
+                .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
+                .eq(AdminUserDO::getStatus, Constant.ENABLE_TEN)
                 .eq(AdminUserDO::getPhone, modifyPwdVO.getPhone()).last("limit 1"));
         if (Objects.isNull(userDO)) {
             throw new BusinessException(ServerResultCode.USER_NOT_EXIT);