fix : 区服bug修复

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服务启动成功 <游戏列表新增字段返回> ( ´･･)ﾉ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 <区服bug修改> ( ´･･)ﾉ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

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

@@ -96,8 +96,8 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
                 .isDelete(DeleteEnum.NO.getCode())
                 .createBy(param.getId() == null ? SecurityUtil.getUserId() : null)
                 .createTime(param.getId() == null ? LocalDateTime.now() : null)
-                .isSourceServer(Boolean.TRUE)
-                .isMerge(Boolean.FALSE)
+                .isSourceServer(param.getId() == null ? Boolean.TRUE : null)
+                .isMerge(param.getId() == null ? Boolean.FALSE : null)
                 .updateBy(SecurityUtil.getUserId())
                 .updateTime(LocalDateTime.now())
                 .build();
@@ -267,7 +267,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     @Override
     public List<GameServerVO> getServerList(Long gameId, Boolean isMerge) {
         return super.list(new LambdaQueryWrapper<GameServer>()
-                .select(GameServer::getServerId, GameServer::getServerName, GameServer :: getIsSourceServer)
+                .select(GameServer::getServerId, GameServer::getServerName, GameServer::getIsSourceServer)
                 .eq(GameServer::getGameId, gameId)
                 .eq(isMerge != null, GameServer::getIsMerge, isMerge)
                 .orderByAsc(GameServer::getStartTime)