Commit 10345280 by huangjy

fix:saas端不需要数据权限

parent 4ff5364f
......@@ -95,13 +95,10 @@ public class PlatTenantServiceImpl extends ServiceImpl<PlatTenantMapper, PlatTen
tenantUserIdList.addAll(StreamUtil.map(tntUserList, PlatUser::getId));
}
List<String> tenantIdList = saasUserService.getDataScopeByUserId();
LambdaQueryWrapper<PlatTenant> lambdaQueryWrapper = new QueryWrapper<PlatTenant>().lambda()
.like(StringUtils.isNotBlank(dto.getName()), PlatTenant::getName, dto.getName())
.eq(StringUtils.isNotBlank(dto.getStatus()), PlatTenant::getStatus, dto.getStatus())
.in(StringUtils.isNotBlank(dto.getUserAccount()), PlatTenant::getPlatUserId, tenantUserIdList)
.in(tenantIdList != null, PlatTenant::getId, tenantIdList);
.in(StringUtils.isNotBlank(dto.getUserAccount()), PlatTenant::getPlatUserId, tenantUserIdList);
lambdaQueryWrapper.orderByDesc(PlatTenant::getCreateDate);
return lambdaQueryWrapper;
......
......@@ -475,11 +475,11 @@ implements SaasUserService{
public List<String> getDataScopeByUserId() {//要不要缓存
SaasUserVO userVO = SaasUserUtil.getUserVO();
if (IdConst.SUPER_ADMIN_ID.equals(userVO.getId())) {
List<String> tenantIdList = StreamUtil.map(platTenantService.list(), PlatTenant::getId);//还是要直接返回null 那边直接不过滤
tenantIdList.add(-1 + "");
return tenantIdList;
/*if (IdConst.SUPER_ADMIN_ID.equals(userVO.getId())) {
} else {
List<SaasUserRole> userRoleList = saasUserRoleService.list(new QueryWrapper<SaasUserRole>().lambda()
......@@ -504,6 +504,6 @@ implements SaasUserService{
tenantIdList.add(-1 + "");
return tenantIdList;
}
}*/
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment