canrd-outside / order-erp · Commits

Commit 928812d4604510f878a8794b3e0b8e2fc7ee9cbc

Authored by qdlgxiemaosheng
1 parent 6bfea81d
build: skipped

feat:用户删除、离职操作

Inline Side-by-side
Showing 2 changed files with 10 additions and 2 deletions
src/main/java/com/order/erp/domain/vo/admin/AdminUserResultVO.java
  View file @928812d
... ... @@ -105,4 +105,10 @@ public class AdminUserResultVO implements Serializable {
105 105 */
106 106 private Integer enableFlag;
107 107  
  108 +
  109 + /**
  110 + * 10，正常，20:禁用
  111 + */
  112 + private Integer status;
  113 +
108 114 }
... ...
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
  View file @928812d
... ... @@ -164,7 +164,6 @@ 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)
168 167 .eq(StringUtils.isNotBlank(queryVO.getUserName()), AdminUserDO::getUserName, queryVO.getUserName())
169 168 .eq(StringUtils.isNotBlank(queryVO.getNickName()), AdminUserDO::getNickName, queryVO.getNickName())
170 169 .eq(StringUtils.isNotBlank(queryVO.getPhone()), AdminUserDO::getPhone, queryVO.getPhone())
... ... @@ -316,8 +315,11 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
316 315 LambdaUpdateWrapper<AdminUserDO> updateWrapper = new LambdaUpdateWrapper<>();
317 316 if (adminUserQueryVO.getOptType() == Constant.THIRTY) {
318 317 updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getStatus, Constant.UNABLE_TWENTY);
  318 + }
  319 + if (adminUserQueryVO.getOptType() == Constant.UNABLE_TWENTY) {
  320 + updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getEnableFlag, Constant.UNABLE_TWENTY);
319 321 } else {
320   - updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getEnableFlag, adminUserQueryVO.getOptType());
  322 + updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getStatus, Constant.ENABLE_TEN);
321 323 }
322 324 update(updateWrapper);
323 325 return ServerResult.success();
... ...