버그 수정

hwe/j_get_nation_general_list.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace sammo;
 
 //통합 세력장수&암행부 viewer
@@ -42,7 +43,7 @@ $viewColumns = [
     'owner_name' => 9,
     'nation' => 0,
     'city' => 1,
-    'officer_level'=>0,
+    'officer_level' => 2,
     'officer_city' => 2,
     'npc' => 0,
     'defence_train' => 2,
@@ -61,7 +62,7 @@ $viewColumns = [
     'crew' => 2,
     'train' => 2,
     'atmos' => 2,
-    'killturn'=>1,
+    'killturn' => 0,
     'turntime' => 2,
     'picture' => 0,
     'imgsvr' => 0,
@@ -78,17 +79,29 @@ $viewColumns = [
 ];
 
 $customViewColumns = [
-    'officerLevel'=>1,
-    'officerLevelText'=>1,
-    'lbonus'=>1,
-    'ownerName'=>1,
-    'honorText'=>1,
-    'expLevelText'=>1,
+    'officerLevel' => 0,
+    'officerLevelText' => 0,
+    'lbonus' => 0,
+    'ownerName' => 0,
+    'honorText' => 0
 ];
 
+function getOfficerLevel($rawGeneral)
+{
+    global $permission;
+    $level = $rawGeneral['officer_level'];
+    if ($level >= 5) {
+        return $level;
+    }
+    if ($permission > 1) {
+        return $level;
+    }
+    return 1;
+}
+
 $specialViewFilter = [
     'officerLevel' => function ($rawGeneral){
-        return $rawGeneral['officer_level'];
+        return getOfficerLevel($rawGeneral);
     },
     'special' => function ($rawGeneral) {
         return getGeneralSpecialDomesticName($rawGeneral['special']);
@@ -108,8 +121,9 @@ $specialViewFilter = [
         }
         return $rawGeneral['owner_name'];
     },
-    'officerLevelText'=>function($rawGeneral)use($nationArr){
-        return getOfficerLevelText($rawGeneral['officer_level'], $nationArr['level']);
+    'officerLevelText' => function ($rawGeneral) use ($nationArr, $specialViewFilter) {
+        $level = getOfficerLevel($rawGeneral);
+        return getOfficerLevelText($level, $nationArr['level']);
     },
     'honorText' => function ($rawGeneral) {
         return getHonor($rawGeneral['experience']);