fix : 游戏区服逻辑修改2

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -21,7 +21,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 <解决bug调试修改1> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <解决bug调试修改2> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServerServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zanxiang.erp.security.util.SecurityUtil;
@@ -29,7 +28,6 @@ import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import reactor.util.function.Tuple2;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -102,15 +100,15 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     @Override
     public IPage<GameServerListVO> listOfPage(GameServerListParam param) {
         //游戏获取
-        Tuple2<String, List<Long>> gameTuple = gameAuthService.getUserGameList(null);
-        List<Long> gameIdList = gameTuple.getT2();
-        if (CollectionUtils.isEmpty(gameIdList)) {
-            return new Page<>();
-        }
-        //不包含参数游戏
-        if (param.getGameId() != null && !gameIdList.contains(param.getGameId())) {
-            return new Page<>();
-        }
+//        Tuple2<String, List<Long>> gameTuple = gameAuthService.getUserGameList(null);
+//        List<Long> gameIdList = gameTuple.getT2();
+//        if (CollectionUtils.isEmpty(gameIdList)) {
+//            return new Page<>();
+//        }
+//        //不包含参数游戏
+//        if (param.getGameId() != null && !gameIdList.contains(param.getGameId())) {
+//            return new Page<>();
+//        }
         Long gameId = null;
         if (param.getGameId() != null) {
             GameDTO gameDTO = gameService.getById(param.getGameId());
@@ -137,6 +135,11 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
         GameServerListVO gameServerListVO = BeanUtil.copy(gameServer, GameServerListVO.class);
         GameSupper gameSupper = gameSupperService.getById(gameServer.getGameId());
         gameServerListVO.setGameName(gameSupper == null ? null : gameSupper.getName());
+        //原始区服, 直接返回
+        if (Objects.equals(gameServer.getIsSourceServer(), Boolean.TRUE)) {
+            return gameServerListVO;
+        }
+        //合服
         List<String> serverIdList = new ArrayList<>();
         String[] sonServerIdArray = null;
         String[] sourceServerIdArray = null;