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 */ + $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;