feat : 标签修改

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GameServiceImpl.java

@@ -418,10 +418,13 @@ public class GameServiceImpl extends ServiceImpl<GameMapper, Game> implements Ga
                 .eq(param.getH5GameId() != null, Game::getH5GameId, param.getH5GameId())
                 .eq(param.getGuideGameId() != null, Game::getGuideGameId, param.getGuideGameId())
                 .eq(param.getStatus() != null, Game::getStatus, param.getStatus())
+                //非父标签查询
                 .apply(param.getGameClassifyId() != null && !Objects.equals(param.getIsParentClassify(), Boolean.TRUE),
                         "FIND_IN_SET({0}, classify)", String.valueOf(param.getGameClassifyId()))
-                .apply(param.getGameClassifyId() != null && Objects.equals(param.getIsParentClassify(), Boolean.TRUE),
-                        "FIND_IN_SET({0}, classify_parent)", String.valueOf(param.getGameClassifyId()))
+                //父标签查询
+                .and(param.getGameClassifyId() != null && Objects.equals(param.getIsParentClassify(), Boolean.TRUE),
+                        qw -> qw.apply("FIND_IN_SET({0}, classify)", String.valueOf(param.getGameClassifyId()))
+                                .or().apply("FIND_IN_SET({0}, classify_parent)", String.valueOf(param.getGameClassifyId())))
                 .orderByDesc(Game::getCreateTime)
         ).convert(game -> this.toVo(game, cpMap, gameCategoryMap, gameMap, gameTagMap));
     }

game-module/game-manage/src/main/java/com/zanxiang/manage/service/Impl/GameTagServiceImpl.java

@@ -147,6 +147,7 @@ public class GameTagServiceImpl extends ServiceImpl<GameTagMapper, GameTag> impl
             if (gameTag == null) {
                 throw new BaseException("参数错误, 游戏分类标签信息不存在");
             }
+            gameTag.setIsParent(param.getParentId() == null);
             gameTag.setParentId(param.getParentId());
             gameTag.setName(param.getName());
             gameTag.setRemark(param.getRemark());