From 1f58c9f4720ab0758cbe99769e13e2998caad15a Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Fri, 30 Sep 2022 17:03:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89SQL=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8E=E4=BB=8D=E6=9F=A5=E8=AF=A2=E5=88=B0?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/modular/user/service/impl/BizUserServiceImpl.java | 3 +++ .../sys/modular/user/service/impl/SysUserServiceImpl.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java index 8a24241f..d0b59b08 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java @@ -51,6 +51,7 @@ import vip.xiaonuo.biz.modular.user.result.BizUserExportResult; import vip.xiaonuo.biz.modular.user.result.BizUserResult; import vip.xiaonuo.biz.modular.user.result.BizUserRoleResult; import vip.xiaonuo.biz.modular.user.service.BizUserService; +import vip.xiaonuo.common.enums.CommonDeleteFlagEnum; import vip.xiaonuo.common.enums.CommonSortOrderEnum; import vip.xiaonuo.common.exception.CommonException; import vip.xiaonuo.common.page.CommonPageRequest; @@ -115,6 +116,8 @@ public class BizUserServiceImpl extends ServiceImpl impl } else { queryWrapper.orderByAsc("SYS_USER.SORT_CODE"); } + // 去除已删除的 + queryWrapper.ne("SYS_USER.DELETE_FLAG", CommonDeleteFlagEnum.DELETED.name()); // 排除超管 queryWrapper.ne("SYS_USER.ID", "-1"); // 校验数据范围 diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index 148924d9..4930a06e 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -48,6 +48,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import vip.xiaonuo.common.cache.CommonCacheOperator; +import vip.xiaonuo.common.enums.CommonDeleteFlagEnum; import vip.xiaonuo.common.enums.CommonSortOrderEnum; import vip.xiaonuo.common.exception.CommonException; import vip.xiaonuo.common.page.CommonPageRequest; @@ -260,6 +261,8 @@ public class SysUserServiceImpl extends ServiceImpl impl } else { queryWrapper.orderByAsc("SYS_USER.SORT_CODE"); } + // 去除已删除的 + queryWrapper.ne("SYS_USER.DELETE_FLAG", CommonDeleteFlagEnum.DELETED.name()); return this.baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper); }