자가 발령 포상 몰수

hwe/sammo/Command/Nation/che_포상.php

@@ -64,9 +64,6 @@ class che_포상 extends Command\NationCommand
         if ($destGeneralID <= 0) {
             return false;
         }
-        if ($destGeneralID == $this->generalObj->getID()) {
-            return false;
-        }
         $this->arg = [
             'isGold' => $isGold,
             'amount' => $amount,
@@ -95,6 +92,13 @@ class che_포상 extends Command\NationCommand
         $destGeneral = General::createGeneralObjFromDB($this->arg['destGeneralID'], ['gold', 'rice', 'nation'], 1);
         $this->setDestGeneral($destGeneral);
 
+        if($this->arg['destGeneralID'] == $this->getGeneral()->getID()){
+            $this->fullConditionConstraints=[
+                ConstraintHelper::AlwaysFail('본인입니다')
+            ];
+            return;
+        }
+
         $this->fullConditionConstraints = [
             ConstraintHelper::NotBeNeutral(),
             ConstraintHelper::OccupiedCity(),
@@ -187,7 +191,7 @@ class che_포상 extends Command\NationCommand
         //TODO: 암행부처럼 보여야...
         $db = DB::db();
 
-        $destRawGenerals = $db->query('SELECT no,name,officer_level,npc,gold,rice FROM general WHERE nation = %i AND no != %i ORDER BY npc,binary(name)', $this->generalObj->getNationID(), $this->generalObj->getID());
+        $destRawGenerals = $db->query('SELECT no,name,officer_level,npc,gold,rice FROM general WHERE nation = %i ORDER BY npc,binary(name)', $this->generalObj->getNationID());
         $destGeneralList = [];
         foreach ($destRawGenerals as $destGeneral) {
             $nameColor = \sammo\getNameColor($destGeneral['npc']);