From ed035ab75f088bc6bbc9289e9f8ad371ab8ab113 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Sat, 29 Jul 2023 18:35:54 +0000
Subject: [PATCH] =?UTF-8?q?fix:=20Phan=20Critical=20=EA=B2=BD=EA=B3=A0=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/sammo/Constraint/ReqGeneralCrewMargin.php | 2 +-
 hwe/sammo/General.php                         | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/hwe/sammo/Constraint/ReqGeneralCrewMargin.php b/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
index 1f8f5e8d..0896bb1f 100644
--- a/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
+++ b/hwe/sammo/Constraint/ReqGeneralCrewMargin.php
@@ -39,7 +39,7 @@ class ReqGeneralCrewMargin extends Constraint{
 
         //XXX: 왜 General -> obj -> General 변환을 하고 있나?
         //FIXME: RankVar, city에 따라 통솔이 바뀐다면 이 부분에 문제가 발생.
-        $generalObj = new General($this->general, null, null, null, null, null, null, true);
+        $generalObj = new General($this->general, null, null, null, null, 180, 1);
 
         if($reqCrewType->id != $generalObj->getCrewTypeObj()->id){
             return true;
diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php
index d7643d88..0012c40a 100644
--- a/hwe/sammo/General.php
+++ b/hwe/sammo/General.php
@@ -1004,10 +1004,14 @@ class General extends GeneralLite implements iAction
                 $result[$generalID] = new DummyGeneral($queryMode->value > 0);
                 continue;
             }
-            if ($rawRanks->hasKey($generalID) && $rawRanks[$generalID]->count() !== count($rankColumn)) {
+            /** @var Map<RankColumn,int|float> */
+            $generalRankValues = $rawRanks[$generalID] ?? new Map();
+            if ($generalRankValues->count() !== count($rankColumn)) {
                 throw new \RuntimeException('column의 수가 일치하지 않음 : ' . $generalID);
             }
-            $result[$generalID] = new static($rawGenerals[$generalID], $rawRanks[$generalID] ?? null, $rawAccessLogs[$generalID] ?? null, null, null, $year, $month);
+
+            $generalAccessLog = $rawAccessLogs[$generalID] ?? new Map();
+            $result[$generalID] = new static($rawGenerals[$generalID], $generalRankValues, $generalAccessLog, null, null, $year, $month);
         }
 
         return $result;