Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Application/Admin/Controller/ConsoleController.class.php

@@ -135,7 +135,7 @@ class ConsoleController extends Think {
         }
     }
 
-    public function doDeleteRepeatUserPlayInfo()
+    public function doDeleteRepeatUserPlayInfo($gameId)
     {
         $sql = 'select id from tab_user_play_info a left join (
             select role_id, server_id, game_id, count(1) from tab_user_play_info where server_id="' . $serverId . '" and game_id = ' . $gameId . ' GROUP BY role_id, server_id, game_id, server_name having count(1) > 1
@@ -185,11 +185,11 @@ class ConsoleController extends Think {
     {
         $gameIds = [157, 148, 150, 151, 158, 175, 142, 143, 172, 173, 154, 155, 176, 165, 164, 179, 156, 153];
         foreach ($gameIds as $gameId) {
-            $this->doDeleteRepeatUserPlayInfo2();
+            $this->doDeleteRepeatUserPlayInfo2($gameId);
         }
     }
 
-    public function doDeleteRepeatUserPlayInfo2()
+    public function doDeleteRepeatUserPlayInfo2($gameId)
     {
         $sql = 'select id from tab_user_play_info a left join (
             select role_id, server_id, game_id, count(1) from tab_user_play_info where server_id="' . $serverId . '" and game_id = ' . $gameId . ' GROUP BY role_id, server_id, game_id, server_name having count(1) > 1