From 8990436e2debdbfb8b9d3e050ce4b58e60a9154a Mon Sep 17 00:00:00 2001 From: Hide_D Date: Mon, 31 Jul 2023 07:33:03 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=88=84=EB=9D=BD=EB=B6=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hwe/sammo/Event/Action/ProcessIncome.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/hwe/sammo/Event/Action/ProcessIncome.php b/hwe/sammo/Event/Action/ProcessIncome.php index e90b39ca..599fc9fc 100644 --- a/hwe/sammo/Event/Action/ProcessIncome.php +++ b/hwe/sammo/Event/Action/ProcessIncome.php @@ -40,7 +40,10 @@ class ProcessIncome extends \sammo\Event\Action $nationList = $db->query('SELECT name,nation,capital,gold,level,rate_tmp,bill,type from nation'); $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation'); //FIXME: factory 형태로 바꿔야함 - $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT %l FROM general WHERE npc != 5', Util::formatListOfBackticks(General::mergeQueryColumn()[0])), 'nation'); + $generalRawListByNation = Util::arrayGroupBy($db->query( + 'SELECT %l FROM general WHERE npc != 5', + Util::formatListOfBackticks(General::mergeQueryColumn()[0]) + ), 'nation'); //국가별 처리 foreach ($nationList as $nation) { @@ -120,7 +123,11 @@ class ProcessIncome extends \sammo\Event\Action $nationList = $db->query('SELECT name,level,nation,capital,rice,rate_tmp,bill,type from nation'); $cityListByNation = Util::arrayGroupBy($db->query('SELECT * FROM city'), 'nation'); - $generalRawListByNation = Util::arrayGroupBy($db->query('SELECT no,name,nation,rice,officer_level,dedication,city FROM general WHERE npc != 5'), 'nation'); + //FIXME: factory 형태로 바꿔야함 + $generalRawListByNation = Util::arrayGroupBy($db->query( + 'SELECT %l FROM general WHERE npc != 5', + Util::formatListOfBackticks(General::mergeQueryColumn()[0]) + ), 'nation'); //국가별 처리 foreach ($nationList as $nation) {