|
@@ -496,10 +496,8 @@ public class WebGatewayImpl implements WebGateway {
|
|
.eq(TblRole::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
|
|
.eq(TblRole::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
|
|
if (tenantId != null) {
|
|
if (tenantId != null) {
|
|
queryWrapper.eq(TblRole::getTenantId, tenantId);
|
|
queryWrapper.eq(TblRole::getTenantId, tenantId);
|
|
- } else {
|
|
|
|
- if (param.getTenantId() != null) {
|
|
|
|
- queryWrapper.eq(TblRole::getTenantId, param.getTenantId());
|
|
|
|
- }
|
|
|
|
|
|
+ } else if (param.getTenantId() != null) {
|
|
|
|
+ queryWrapper.eq(TblRole::getTenantId, param.getTenantId());
|
|
}
|
|
}
|
|
|
|
|
|
// 2. 查询如果为空,则返回空集合
|
|
// 2. 查询如果为空,则返回空集合
|