From 3762d9050cefa738dadaa7e864f73f5ca5c53f85 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sun, 26 Mar 2023 02:55:42 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20GetCityInfo=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=B6=9C=EB=A0=A5=EB=90=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/API/City/GetCityInfo.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hwe/sammo/API/City/GetCityInfo.php b/hwe/sammo/API/City/GetCityInfo.php
index 016fd33a..56cdd49e 100644
--- a/hwe/sammo/API/City/GetCityInfo.php
+++ b/hwe/sammo/API/City/GetCityInfo.php
@@ -143,7 +143,7 @@ class GetCityInfo extends \sammo\BaseAPI
 
     $nationStaticList = getAllNationStaticInfo();
 
-    $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE city = %i ORDER BY turntime ASC', Util::formatListOfBackticks(array_keys(static::$viewColumns)), $cityID), 'city');
+    $rawGeneralList = Util::convertArrayToDict($db->query('SELECT %l from general WHERE city = %i ORDER BY turntime ASC', Util::formatListOfBackticks(array_keys(static::$viewColumns)), $cityID), 'no');
     $ourNationGeneralIDList = new Set();
     foreach ($rawGeneralList as $rawGeneral) {
       if ($rawGeneral['nation'] == $nationID) {
@@ -307,12 +307,12 @@ class GetCityInfo extends \sammo\BaseAPI
     $currentCityID = $me['city'];
     //TODO: 조건 조사
 
-    $cityList = new Set($db->queryFirstField('SELECT city FROM city WHERE nation=%i', $nationID));
+    $cityList = new Set($db->queryFirstColumn('SELECT city FROM city WHERE nation=%i', $nationID));
 
     $spyList = JSON::decode($db->queryFirstField('SELECT spy FROM nation WHERE nation=%i', $nationID));
     $showLevel = $this->calcShowLevel($cityID, $currentCityID, $nationID, $cityList, key_exists($cityID, $spyList));
 
-    $rawCity = $db->queryFirstRow('SELECT * FROM city WHERE no=%i', $cityID);
+    $rawCity = $db->queryFirstRow('SELECT * FROM city WHERE city=%i', $cityID);
     $filteredCity = $this->filterCity($rawCity, $showLevel);
 
     $result = [
@@ -323,6 +323,7 @@ class GetCityInfo extends \sammo\BaseAPI
       'nationCityList' => $cityList->toArray(),
       'myGeneralID' => $session->generalID,
       'currentCityID' => $currentCityID,
+      'showLevel' => $showLevel,
       'cityGeneralList' => $this->getGeneralList($cityID, $nationID, $showLevel)
     ];