From 7cfdb403b36f80f0554f9a5bbf8b8f82f52a1272 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sun, 10 May 2020 03:26:25 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=99=EC=9D=80=20=EC=9E=A5=EC=88=98=20?=
 =?UTF-8?q?=EA=B0=99=EC=9D=80=20=EA=B4=80=EC=A7=81=20=EC=9E=84=EB=AA=85?=
 =?UTF-8?q?=EC=8B=9C=20=EB=B2=84=EA=B7=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/j_myBossInfo.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/hwe/j_myBossInfo.php b/hwe/j_myBossInfo.php
index e95b57d1..c8d93fd1 100644
--- a/hwe/j_myBossInfo.php
+++ b/hwe/j_myBossInfo.php
@@ -72,10 +72,7 @@ if($officerLevel == 12){
 }
 
 function do수뇌임명(General $general, int $targetOfficerLevel):?string{
-    global $myOfficerLevel;
     $generalID = $general->getID();
-    $officerLevel = $general->getVar('officer_level');
-    $generalName = $general->getVar('name');
     $nationID = $general->getNationID();
 
     $db = DB::db();
@@ -97,7 +94,7 @@ function do수뇌임명(General $general, int $targetOfficerLevel):?string{
     $db->update('general', [
         'officer_level'=>1,
         'officer_city'=>0,
-    ], 'nation=%i AND officer_level=%i', $nationID, $targetOfficerLevel);
+    ], 'nation=%i AND officer_level=%i AND no!=%i', $nationID, $targetOfficerLevel, $generalID);
 
     if($targetOfficerLevel === 11){
 
@@ -147,7 +144,7 @@ function do도시임명(General $general, int $cityID, int $targetOfficerLevel):
     $db->update('general', [
         'officer_level'=>1,
         'officer_city'=>0,
-    ], 'officer_level=%i AND officer_city=%i', $targetOfficerLevel, $cityID);
+    ], 'officer_level=%i AND officer_city=%i AND no!=%i', $targetOfficerLevel, $cityID, $general->getID());
 
     if($general instanceof DummyGeneral){
         return null;