|
@@ -139,9 +139,15 @@ public class CubeDataController extends BladeController {
|
|
// 判断是否超级权限组「拥有所有权限」
|
|
// 判断是否超级权限组「拥有所有权限」
|
|
long userId = getUser().getUserId();
|
|
long userId = getUser().getUserId();
|
|
Boolean checkSuperPermRet = dataPermClient.checkSuperPermission(userId);
|
|
Boolean checkSuperPermRet = dataPermClient.checkSuperPermission(userId);
|
|
- LambdaQueryWrapper<CubeData> queryWrapper = Condition.getQueryWrapper(cubeData).lambda().eq(CubeData::getDisplayStatus, 1).orderByDesc(CubeData::getId);
|
|
|
|
- queryWrapper.like(StringUtils.isNotBlank(cubeData.getCubeName()), CubeData::getRemark, cubeData.getCubeName());
|
|
|
|
-
|
|
|
|
|
|
+ //LambdaQueryWrapper<CubeData> queryWrapper = Condition.getQueryWrapper(cubeData).lambda().eq(CubeData::getDisplayStatus, 1).orderByDesc(CubeData::getId);
|
|
|
|
+ LambdaQueryWrapper<CubeData> queryWrapper = Wrappers.<CubeData>lambdaQuery().eq(CubeData::getDisplayStatus, 1).orderByDesc(CubeData::getId);
|
|
|
|
+ if(StringUtils.isNotBlank(cubeData.getCubeName())){
|
|
|
|
+ queryWrapper.and((wrapper)->{
|
|
|
|
+ wrapper.like(CubeData::getCubeName, cubeData.getCubeName())
|
|
|
|
+ .or()
|
|
|
|
+ .like(CubeData::getRemark, cubeData.getCubeName());
|
|
|
|
+ });
|
|
|
|
+ }
|
|
// 非超级权限组用户,查询有权限的数据集列表
|
|
// 非超级权限组用户,查询有权限的数据集列表
|
|
if (checkSuperPermRet == null || !checkSuperPermRet) {
|
|
if (checkSuperPermRet == null || !checkSuperPermRet) {
|
|
queryWrapper.and(wrapper -> {
|
|
queryWrapper.and(wrapper -> {
|