canrd-outside / order-erp · Commits

Commit a28260539efcf464ef85d5d4d0a2700264a569e9

Authored by qdlgxiemaosheng
1 parent 623c9701
build: skipped

feat:用户删除、离职操作

Inline Side-by-side
Showing 4 changed files with 17 additions and 5 deletions
sql/dml_20231224.sql 0 → 100644
  View file @a282605
  1 +alter table `admin_user` add column `status` DOUBLE DEFAULT 10 COMMENT '状态 10 正常，20 禁用';
... ...
src/main/java/com/order/erp/controller/UserController.java
  View file @a282605
... ... @@ -85,7 +85,7 @@ public class UserController {
85 85 @PostMapping(value = "/opt")
86 86 @AnonymousAccess
87 87 public ServerResult opt(@RequestBody @Validated AdminUserQueryVO queryVO) {
88   - return userService.deleteById(queryVO);
  88 + return userService.opt(queryVO);
89 89 }
90 90  
91 91 @Log("修改密码")
... ...
src/main/java/com/order/erp/domain/dto/admin/AdminUserDO.java
  View file @a282605
... ... @@ -88,4 +88,9 @@ public class AdminUserDO extends BaseDO implements Serializable {
88 88 */
89 89 private String remark;
90 90  
  91 + /**
  92 + * 10，正常，20:禁用
  93 + */
  94 + private Integer status;
  95 +
91 96 }
... ...
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
  View file @a282605
... ... @@ -164,6 +164,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
164 164 private LambdaQueryWrapper<AdminUserDO> buildQueryByParam(AdminUserQueryVO queryVO) {
165 165 return new LambdaQueryWrapper<AdminUserDO>()
166 166 .in(BaseDO::getEnableFlag, Arrays.asList(Constant.ENABLE_TEN, Constant.THIRTY))
  167 + .eq(AdminUserDO::getStatus, Constant.ENABLE_TEN)
167 168 .eq(StringUtils.isNotBlank(queryVO.getUserName()), AdminUserDO::getUserName, queryVO.getUserName())
168 169 .eq(StringUtils.isNotBlank(queryVO.getNickName()), AdminUserDO::getNickName, queryVO.getNickName())
169 170 .eq(StringUtils.isNotBlank(queryVO.getPhone()), AdminUserDO::getPhone, queryVO.getPhone())
... ... @@ -312,9 +313,12 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
312 313 if (CollUtil.isEmpty(adminUserList)) {
313 314 return ServerResult.success();
314 315 }
315   - LambdaUpdateWrapper<AdminUserDO> updateWrapper = new LambdaUpdateWrapper<AdminUserDO>()
316   - .in(AdminUserDO::getId, ids)
317   - .set(AdminUserDO::getEnableFlag, adminUserQueryVO.getOptType());
  316 + LambdaUpdateWrapper<AdminUserDO> updateWrapper = new LambdaUpdateWrapper<>();
  317 + if (adminUserQueryVO.getOptType() == Constant.THIRTY) {
  318 + updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getStatus, Constant.UNABLE_TWENTY);
  319 + } else {
  320 + updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getEnableFlag, adminUserQueryVO.getOptType());
  321 + }
318 322 update(updateWrapper);
319 323 return ServerResult.success();
320 324 }
... ... @@ -463,7 +467,9 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
463 467 if (!modifyPwdVO.getPassword().equals(modifyPwdVO.getConfirmPassword())) {
464 468 throw new BusinessException(ServerResultCode.MEMBER_CONFIRM_PASSWORD_ERROR);
465 469 }
466   - AdminUserDO userDO = getOne(new LambdaQueryWrapper<AdminUserDO>().eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
  470 + AdminUserDO userDO = getOne(new LambdaQueryWrapper<AdminUserDO>()
  471 + .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
  472 + .eq(AdminUserDO::getStatus, Constant.ENABLE_TEN)
467 473 .eq(AdminUserDO::getPhone, modifyPwdVO.getPhone()).last("limit 1"));
468 474 if (Objects.isNull(userDO)) {
469 475 throw new BusinessException(ServerResultCode.USER_NOT_EXIT);
... ...