|
@@ -99,9 +99,8 @@ public class GameCategoryServiceImpl extends ServiceImpl<GameCategoryMapper, Gam
|
|
|
.eq(StringUtils.isBlank(param.getLabelName()) && Objects.equals(param.getIsParent(), Boolean.TRUE),
|
|
|
GameCategory::getParentId, 0)
|
|
|
//条件不为空查询父标签
|
|
|
- .and(StringUtils.isNotBlank(param.getLabelName()) && Objects.equals(param.getIsParent(), Boolean.TRUE),
|
|
|
- qw -> qw.in(!parentIdList.isEmpty(), GameCategory::getParentId, parentIdList)
|
|
|
- .or().like(GameCategory::getName, param.getLabelName()))
|
|
|
+ .in(StringUtils.isNotBlank(param.getLabelName()) && Objects.equals(param.getIsParent(), Boolean.TRUE)
|
|
|
+ && !parentIdList.isEmpty(), GameCategory::getParentId, parentIdList)
|
|
|
.eq(GameCategory::getType, GameCategoryEnum.GAME_LABEL.getCategoryType())
|
|
|
.orderByDesc(GameCategory::getCreateTime))
|
|
|
.convert(this::toVo);
|