Merge remote-tracking branch 'origin/package' into package

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

@@ -84,9 +84,9 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     }
 
     private void gameServerAssign(GameServerAssignParam param, GameServer gameServer) {
-        if (Objects.equals(gameServer.getIsSourceServer(), Boolean.FALSE)) {
-            return;
-        }
+//        if (Objects.equals(gameServer.getIsSourceServer(), Boolean.FALSE)) {
+//            return;
+//        }
         //老的指派人员id
         String oldUserIds = null;
         if (Objects.equals(param.getAssignType(), GameServerAssignEnum.GAME_SERVER_ASSIGN_GS)) {
@@ -351,16 +351,16 @@ 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 (Strings.isNotBlank(gameServer.getCustomerIds())) {
+            gameServerListVO.setCustomerList(this.getUserBeanList(gameServer.getCustomerIds()));
+        }
+        //指派GS
+        if (Strings.isNotBlank(gameServer.getGsIds())) {
+            gameServerListVO.setGsList(this.getUserBeanList(gameServer.getGsIds()));
+        }
         //原始区服, 直接返回
         if (Objects.equals(gameServer.getIsSourceServer(), Boolean.TRUE)) {
-            //指派客服
-            if (Strings.isNotBlank(gameServer.getCustomerIds())) {
-                gameServerListVO.setCustomerList(this.getUserBeanList(gameServer.getCustomerIds()));
-            }
-            //指派GS
-            if (Strings.isNotBlank(gameServer.getGsIds())) {
-                gameServerListVO.setGsList(this.getUserBeanList(gameServer.getGsIds()));
-            }
             return gameServerListVO;
         }
         //合服