diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index 24a8b51..3f0e781 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -61,6 +61,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public TableDataInfo selectPageUserList(SysUserBo user, PageQuery pageQuery) { + user.setUserCategory("0"); Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); return TableDataInfo.build(page); } @@ -109,6 +110,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { Map params = user.getParams(); LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(SysUser::getDelFlag, SystemConstants.NORMAL) + .eq(ObjectUtil.isNotNull(user.getUserCategory()), SysUser::getUserCategory, user.getUserCategory()) .eq(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()) .eq(ObjectUtil.isNotNull(user.getMktNo()), SysUser::getMktNo, user.getMktNo()) .in(StringUtils.isNotBlank(user.getUserIds()), SysUser::getUserId, StringUtils.splitTo(user.getUserIds(), Convert::toLong))