From 14d9b0dd31a76a33873323289164b2bc15d4f146 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 5 Jul 2018 00:24:03 +0900
Subject: [PATCH] =?UTF-8?q?=ED=98=84=EC=9E=AC=20=EC=A7=84=ED=96=89?=
 =?UTF-8?q?=EC=A4=91=EC=9D=B8=20=EA=B9=83=EC=88=98=EC=9D=B8=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EC=9E=A5=EC=88=98=EA=B0=80=20=EC=95=88=20=EC=A3=BD?=
 =?UTF-8?q?=EC=97=88=EC=9C=BC=EB=A9=B4=20=EC=95=88=EB=82=98=ED=83=80?=
 =?UTF-8?q?=EB=82=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/a_emperior_detail.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/hwe/a_emperior_detail.php b/hwe/a_emperior_detail.php
index e290ab11..6636ef31 100644
--- a/hwe/a_emperior_detail.php
+++ b/hwe/a_emperior_detail.php
@@ -173,14 +173,27 @@ if($showServers){
         $nation['typeName'] = getNationType($nation['type']);
         $nation['levelName'] = getNationLevel($nation['level']);
         if($nation['generals']){
-            $generals = $db->query('SELECT `general_no`, `name` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nation['generals']);
-            $nation['generalsFull'] = $generals;
+            $generals = $db->query('SELECT `general_no`, `name`, `last_yearmonth` FROM ng_old_generals WHERE server_id=%s AND general_no IN %li', $serverID, $nation['generals']);
+
+            if(count($generals) != $nation['generals'] && $serverID == UniqueConst::$serverID){
+                $liveGenerals = $nation['generals'];
+                foreach($generals as $general){
+                    if(in_array($general['general_no'], $nation['generals'])){
+                        unset($nation['generals'][$general['general_no']]);
+                    }
+                }
+                $liveGenerals = $db->query('SELECT `no`as`general_no`, `name` FROM general WHERE no IN %li', $liveGenerals);
+                $nation['generalsFull'] = array_merge($liveGenerals, $generals);
+            }
+            else{
+                $nation['generalsFull'] = $generals;
+            }
         }
         else{
             $nation['generalsFull'] = [];
         }
 
-        if(key_exists('aux', $nation)){
+        if(key_exists('aux', $nation) && !is_array($nation['aux'])){
             $nation += Json::decode($nation['aux']);
         }