From ac8a9d76851fbbc11d19ff4c1e4718e7987375c3 Mon Sep 17 00:00:00 2001
From: "G01\\fj2532ir" <fj2532ir@aa.jp.fujitsu.com>
Date: Thu, 5 Jun 2025 14:51:55 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20getHoliday=E3=81=A7=E5=8F=96=E5=BE=97?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=AB=E3=83=A9=E3=83=A0=E6=95=B0=E3=82=92?=
 =?UTF-8?q?=E6=B8=9B=E3=82=89=E3=81=97=E3=81=A6=E3=80=81getHolidayInYear?=
 =?UTF-8?q?=E3=81=A7=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=82=92?=
 =?UTF-8?q?=E4=BD=9C=E3=82=89=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/Holiday.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/Model/Holiday.php b/Model/Holiday.php
index 4d262be..de37395 100644
--- a/Model/Holiday.php
+++ b/Model/Holiday.php
@@ -93,12 +93,17 @@ public function isHoliday($date = null) {
  */
 	public function getHoliday($from, $to) {
 		$holidays = $this->cacheFindQuery('all', array(
+			'fields' => array(
+				'Holiday.id',
+				'Holiday.holiday',
+				'Holiday.title'
+			),
 			'conditions' => array(
 				'language_id' => Current::read('Language.id'),
 				'holiday >=' => $from,
 				'holiday <=' => $to
 			),
-			'recursive' => 0,
+			'recursive' => -1,
 			'order' => array('holiday')
 		));
 		return $holidays;
@@ -120,7 +125,15 @@ public function getHolidayInYear($year = null) {
 		}
 		$from = $year . '-01-01';
 		$to = $year . '-12-31';
-		$holidays = $this->getHoliday($from, $to);
+		$holidays = $this->Find('all', array(
+			'conditions' => array(
+				'language_id' => Current::read('Language.id'),
+				'holiday >=' => $from,
+				'holiday <=' => $to
+			),
+			'recursive' => 0,
+			'order' => array('holiday')
+		));
 		return $holidays;
 	}