From b67bc20f1b1c3bfa281a857717c11a1ac17fe49e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B6=8C=ED=98=81=EC=84=B1?= Date: Sat, 7 Mar 2026 03:05:19 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=EA=B8=B0=ED=83=80=20=EB=AA=A8?= =?UTF-8?q?=EB=8D=B8/=EC=84=A4=EC=A0=95=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - PayrollSetting 모델 수정 - PptxController 수정 Co-Authored-By: Claude Opus 4.6 --- app/Http/Controllers/Additional/PptxController.php | 2 +- app/Models/HR/PayrollSetting.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Additional/PptxController.php b/app/Http/Controllers/Additional/PptxController.php index 2a585c90..4ffb7a8d 100644 --- a/app/Http/Controllers/Additional/PptxController.php +++ b/app/Http/Controllers/Additional/PptxController.php @@ -19,7 +19,7 @@ class PptxController extends Controller '/var/www/docs/rules' => ['label' => '정책/규칙', 'source' => 'docs'], '/var/www/docs/guides' => ['label' => '가이드', 'source' => 'docs'], '/var/www/docs/projects' => ['label' => '프로젝트', 'source' => 'docs'], - '/var/www/docs/plans' => ['label' => '계획', 'source' => 'docs'], + '/var/www/docs/dev_plans' => ['label' => '계획', 'source' => 'docs'], '/var/www/mng/docs/pptx-output' => ['label' => '산출물', 'source' => 'mng'], '/var/www/mng/docs' => ['label' => '교육/문서', 'source' => 'mng'], '/var/www/mng/public/docs' => ['label' => '공개 문서', 'source' => 'mng'], diff --git a/app/Models/HR/PayrollSetting.php b/app/Models/HR/PayrollSetting.php index 30dba1cc..f2871aa8 100644 --- a/app/Models/HR/PayrollSetting.php +++ b/app/Models/HR/PayrollSetting.php @@ -62,7 +62,7 @@ class PayrollSetting extends Model public function scopeForTenant($query, ?int $tenantId = null) { - $tenantId = $tenantId ?? session('selected_tenant_id', 1); + $tenantId = $tenantId ?? session('selected_tenant_id') ?? 1; return $query->where('tenant_id', $tenantId); } @@ -73,7 +73,7 @@ public function scopeForTenant($query, ?int $tenantId = null) public static function getOrCreate(?int $tenantId = null): self { - $tenantId = $tenantId ?? session('selected_tenant_id', 1); + $tenantId = $tenantId ?? session('selected_tenant_id') ?? 1; return self::firstOrCreate( ['tenant_id' => $tenantId],