Merge branch 'dev' into test

This commit is contained in:
lzx
2026-01-09 16:42:23 +08:00

View File

@@ -103,8 +103,8 @@ public class DatabusUserProviderApiImpl implements DatabusUserProviderApi {
Long total = null;
if (reqDTO.isFirstPage()) {
LambdaQueryWrapper<AdminUserDO> countWrapper = new LambdaQueryWrapper<>();
// ⚠️ 只统计 userSource = 2 的用户
countWrapper.eq(AdminUserDO::getUserSource, 2);
// ⚠️ 只统计 userSource = 3 的用户
countWrapper.eq(AdminUserDO::getUserSource, 3);
if (reqDTO.getTenantId() != null) {
countWrapper.eq(AdminUserDO::getTenantId, reqDTO.getTenantId());
}
@@ -148,8 +148,8 @@ public class DatabusUserProviderApiImpl implements DatabusUserProviderApi {
@Override
public CommonResult<Long> count(Long tenantId) {
LambdaQueryWrapper<AdminUserDO> queryWrapper = new LambdaQueryWrapper<>();
// ⚠️ 只统计 userSource = 2 的用户
queryWrapper.eq(AdminUserDO::getUserSource, 2);
// ⚠️ 只统计 userSource = 3 的用户
queryWrapper.eq(AdminUserDO::getUserSource, 3);
if (tenantId != null) {
queryWrapper.eq(AdminUserDO::getTenantId, tenantId);
}