From e31283d2f97a0b801c36283df27627d530637ce6 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 17 Nov 2022 15:47:12 +0800 Subject: [PATCH] * Modified Obtain the configuration information about the workweek. --- module/holiday/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/holiday/model.php b/module/holiday/model.php index e43442f049..cfffe7ff23 100644 --- a/module/holiday/model.php +++ b/module/holiday/model.php @@ -198,12 +198,13 @@ class holidayModel extends model { if(empty($begin) or empty($end) or $begin == '0000-00-00' or $end == '0000-00-00') return array(); + $this->app->loadConfig('execution'); $actualDays = array(); $currentDay = $begin; $holidays = $this->getHolidays($begin, $end); $workingDays = $this->getWorkingDays($begin, $end); - $weekend = isset($this->config->project->weekend) ? $this->config->project->weekend : 2; + $weekend = isset($this->config->execution->weekend) ? $this->config->execution->weekend : 2; $holidaysFlip = array_flip($holidays); $workingDaysFlip = array_flip($workingDays);