GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: GTsoft:efc7415b89928d9ab6bb6f2186492eb1dd00324c
Branches Tags
GTsoft:main
GTsoft:jasperReport
...
compare: GTsoft:4bdea6c06d1317df6a6614f7c9c551a4d8ae18da
Branches Tags
GTsoft:main
GTsoft:jasperReport

2 Commits
efc7415b89 ... 4bdea6c06d

Author SHA1 Message Date
SGK\17962
4bdea6c06d Merge remote-tracking branch 'origin/main' 2025-10-30 11:40:32 +08:00
SGK\17962
1c0b8952d7 用户列表不显示admin 2025-10-30 11:40:20 +08:00
1 changed files with 2 additions and 0 deletions
Show Stats Expand all files Collapse all files

2
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
View File

@ -61,6 +61,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override @Override
public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) { public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
user.setUserCategory("0");
Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
return TableDataInfo.build(page); return TableDataInfo.build(page);
} }
@ -109,6 +110,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
Map<String, Object> params = user.getParams(); Map<String, Object> params = user.getParams();
LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery();
wrapper.eq(SysUser::getDelFlag, SystemConstants.NORMAL) 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.getUserId()), SysUser::getUserId, user.getUserId())
.eq(ObjectUtil.isNotNull(user.getMktNo()), SysUser::getMktNo, user.getMktNo()) .eq(ObjectUtil.isNotNull(user.getMktNo()), SysUser::getMktNo, user.getMktNo())
.in(StringUtils.isNotBlank(user.getUserIds()), SysUser::getUserId, StringUtils.splitTo(user.getUserIds(), Convert::toLong)) .in(StringUtils.isNotBlank(user.getUserIds()), SysUser::getUserId, StringUtils.splitTo(user.getUserIds(), Convert::toLong))