From 9520d29109290f11abeb275bdb185836e591fa68 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Thu, 3 Aug 2023 13:31:30 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20General=20=EC=83=9D=EC=84=B1=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/API/NationCommand/GetReservedCommand.php | 10 ++++++++--
 hwe/sammo/Constraint/ReqGeneralCrewMargin.php      |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hwe/sammo/API/NationCommand/GetReservedCommand.php b/hwe/sammo/API/NationCommand/GetReservedCommand.php
index 660bb252..bf76f287 100644
--- a/hwe/sammo/API/NationCommand/GetReservedCommand.php
+++ b/hwe/sammo/API/NationCommand/GetReservedCommand.php
@@ -12,6 +12,7 @@ use sammo\General;
 use sammo\Json;
 use sammo\KVStorage;
 use sammo\TimeUtil;
+use sammo\Util;
 
 use function sammo\checkLimit;
 use function sammo\checkSecretPermission;
@@ -42,7 +43,8 @@ class GetReservedCommand extends \sammo\BaseAPI
 
         $me = $db->queryFirstRow(
             'SELECT no,nation,officer_level,refresh_score,turntime,belong,penalty,permission FROM `general`
-            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i', $userID
+            LEFT JOIN general_access_log AS l ON `general`.no = l.general_id WHERE owner=%i',
+            $userID
         );
 
         $nationLevel = $db->queryFirstField('SELECT level FROM nation WHERE nation = %i', $me['nation']);
@@ -62,7 +64,11 @@ class GetReservedCommand extends \sammo\BaseAPI
         [$turnTerm, $year, $month, $lastExecute] = $gameStor->getValuesAsArray(['turnterm', 'year', 'month', 'turntime']);
 
         $generals = [];
-        foreach ($db->query('SELECT no,name,turntime,npc,city,nation,officer_level FROM general WHERE nation = %i AND officer_level >= 5', $nationID) as $rawGeneral) {
+        foreach ($db->query(
+            'SELECT %l FROM general WHERE nation = %i AND officer_level >= 5',
+            Util::formatListOfBackticks(General::mergeQueryColumn())[0],
+            $nationID
+        ) as $rawGeneral) {
             $generals[$rawGeneral['officer_level']] = new General($rawGeneral, null, null, null, null, $year, $month, false);
         }
 
diff --git a/hwe/sammo/Constraint/ReqGeneralCrewMargin.php b/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
index 0896bb1f..4999e57e 100644
--- a/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
+++ b/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
@@ -20,7 +20,7 @@ class ReqGeneralCrewMargin extends Constraint{
             throw new \InvalidArgumentException("{$this->arg} is invalid crewtype");
         }
 
-        foreach(['leadership','strength','intel','crew','crewtype','nation','officer_level'] as $key){
+        foreach(['leadership','strength','intel','crew','crewtype','nation','officer_level','aux'] as $key){
             if(!key_exists($key, $this->general)){
                 if(!$throwExeception){return false; }
                 throw new \InvalidArgumentException("require {$key} in general");