feat:用户删除、离职操作

qdlgxiemaosheng
1 parent 6bfea81d
Showing 2 changed files with 10 additions and 2 deletions
src/main/java/com/order/erp/domain/vo/admin/AdminUserResultVO.java
src/main/java/com/order/erp/service/admin/impl/AdminUserServiceImpl.java
@@ -105,4 +105,10 @@ public class AdminUserResultVO implements Serializable {
      */
     private Integer enableFlag;
+
+    /**
+     * 10，正常，20:禁用
+     */
+    private Integer status;
+
 }
@@ -164,7 +164,6 @@ 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())
@@ -316,8 +315,11 @@ public class AdminUserServiceImpl extends ServiceImpl&lt;AdminUserMapper, AdminUser
         LambdaUpdateWrapper<AdminUserDO> updateWrapper = new LambdaUpdateWrapper<>();
         if (adminUserQueryVO.getOptType() == Constant.THIRTY) {
             updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getStatus, Constant.UNABLE_TWENTY);
+        }
+        if (adminUserQueryVO.getOptType() == Constant.UNABLE_TWENTY) {
+            updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getEnableFlag, Constant.UNABLE_TWENTY);
         } else {
-            updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getEnableFlag, adminUserQueryVO.getOptType());
+            updateWrapper.in(AdminUserDO::getId, ids).set(AdminUserDO::getStatus, Constant.ENABLE_TEN);
         }
         update(updateWrapper);
         return ServerResult.success();