zgty/zt-dsc
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
This commit is contained in:
lzx
2026-01-09 16:42:23 +08:00
parent c5211287ab 5366a35546
commit a210af0dd8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/api/databus/DatabusUserProviderApiImpl.java
View File

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