diff --git a/hwe/b_battleCenter.php b/hwe/b_battleCenter.php
index 6d25f6ec..c9ca2df8 100644
--- a/hwe/b_battleCenter.php
+++ b/hwe/b_battleCenter.php
@@ -82,13 +82,13 @@ if ($btn == '정렬하기') {
[$queryTypeText, $reqArgType, $comp] = $queryMap[$reqQueryType];
if($reqArgType===0){
- $generalBasicList = $db->query('SELECT no, name, npc, turntime FROM general WHERE nation = %i', $nationID);
+ $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level FROM general WHERE nation = %i', $nationID);
}
else if($reqArgType===1){
- $generalBasicList = $db->query('SELECT no, name, npc, turntime, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
+ $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, %b FROM general WHERE nation = %i', $reqQueryType, $nationID);
}
else if($reqArgType===2){
- $generalBasicList = $db->query('SELECT no, name, npc, turntime, value as %b
+ $generalBasicList = $db->query('SELECT no, name, npc, turntime, officer_level, value as %b
FROM general LEFT JOIN rank_data
ON general.no = rank_data.general_id
WHERE rank_data.type = %b AND general.nation = %i',
@@ -99,7 +99,7 @@ else if($reqArgType===3){
$generalBasicList = array_map(function($arr){
$arr['aux'] = Json::decode($arr['aux']);
return $arr;
- }, $db->query('SELECT no, name, npc, turntime, aux FROM general WHERE nation = %i', $nationID));
+ }, $db->query('SELECT no, name, npc, turntime, officer_level, aux FROM general WHERE nation = %i', $nationID));
}
else{
throw new \sammo\MustNotBeReachedException();
@@ -145,7 +145,7 @@ $showGeneral = General::createGeneralObjFromDB($gen);
대상장수 :
diff --git a/hwe/sammo/Command/General/che_군량매매.php b/hwe/sammo/Command/General/che_군량매매.php
index f5ba8650..e9769caf 100644
--- a/hwe/sammo/Command/General/che_군량매매.php
+++ b/hwe/sammo/Command/General/che_군량매매.php
@@ -148,7 +148,7 @@ class che_군량매매 extends Command\GeneralCommand{
}
$general->increaseVar($buyKey, $buyAmount);
- $general->increaseVarWithLimit($sellKey, $sellAmount, 0);
+ $general->increaseVarWithLimit($sellKey, -$sellAmount, 0);
$db->update('nation', [
'gold'=>$db->sqleval('gold + %i', $tax)