From 170a32a1bdba609314a52d4274f8bdf79bcdcf3e Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 28 Apr 2018 20:49:38 +0900
Subject: [PATCH] =?UTF-8?q?=EB=93=B1=EC=9A=A9=EC=9E=A5=20=EB=A9=94?=
 =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=86=A1=EC=8B=A0=EC=9D=B4=20=EC=9D=B4?=
 =?UTF-8?q?=EC=83=81=ED=95=9C=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0.?=
 =?UTF-8?q?=20=EC=9D=B8=EC=82=AC=EB=B6=80=20'=EA=B3=B5=EC=84=9D'=20?=
 =?UTF-8?q?=EC=A7=80=EC=A0=95=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/c_myBossInfo.php       | 19 +++++++++++--------
 hwe/sammo/ScoutMessage.php | 10 +++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/hwe/c_myBossInfo.php b/hwe/c_myBossInfo.php
index f56dba4f..f8c352bf 100644
--- a/hwe/c_myBossInfo.php
+++ b/hwe/c_myBossInfo.php
@@ -41,17 +41,20 @@ if($meLevel < 5){
 
 
 if($btn == "임명") {
-    $query = "select no,nation,level,leader,power,intel from general where no='$genlist'";
-    $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
-    $general = MYDB_fetch_array($result);
+    if($genlist !== 0){
+        $query = "select no,nation,level,leader,power,intel from general where no='$genlist'";
+        $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
+        $general = MYDB_fetch_array($result);
 
-    if(!$general){
-        header('location:b_myBossInfo.php');
-        exit();
+        if(!$general){
+            header('location:b_myBossInfo.php');
+            exit();
+        }
     }
+        
 
     //임명할사람이 군주이면 불가, 내가 수뇌부이어야함, 공석아닌때는 국가가 같아야함
-    if($general['level'] == 12 || $meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0)) {
+    if($meLevel < 5 || ($general['nation'] != $me['nation'] && $genlist != 0) || ($general['level'] == 12 && $genlist != 0)) {
         
         header('location:b_myBossInfo.php');
         exit();
@@ -74,7 +77,7 @@ if($btn == "임명") {
 }
 
 //나와 대상 장수는 국가가 같아야 함
-if($me['nation'] != $general['nation']){
+if($genlist != 0 && $me['nation'] != $general['nation']){
     header('location:b_myBossInfo.php');
     exit();
 }
diff --git a/hwe/sammo/ScoutMessage.php b/hwe/sammo/ScoutMessage.php
index f7fc1e1e..56298cbd 100644
--- a/hwe/sammo/ScoutMessage.php
+++ b/hwe/sammo/ScoutMessage.php
@@ -72,7 +72,7 @@ class ScoutMessage extends Message{
             return $result;
         }
 
-        $helper = new Engine\Personnel($this->src->nationID, $this->src->senderID);
+        $helper = new Engine\Personnel($this->src->nationID, $this->src->generalID);
 
         list($result, $reason) = $helper->scoutGeneral($receiverID);
 
@@ -116,9 +116,9 @@ class ScoutMessage extends Message{
             "{$this->src->nationName}(으)로 등용 제의 수락",
             new \DateTime(),
             new \DateTime('9999-12-31'),
-            Json::encode([
+            [
                 'delete'=>$this->id
-            ])
+            ]
         );
         $newMsg->send(true);
 
@@ -137,9 +137,9 @@ class ScoutMessage extends Message{
             "{$this->src->nationName}(으)로 등용 제의 거부",
             new \DateTime(),
             new \DateTime('9999-12-31'),
-            Json::encode([
+            [
                 'delete'=>$this->id
-            ])
+            ]
         );
         $newMsg->send(true);