diff --git a/db/update21.7.3.sql b/db/update21.7.3.sql index c8c671e975..6d6b5490d0 100644 --- a/db/update21.7.3.sql +++ b/db/update21.7.3.sql @@ -54,4 +54,7 @@ SET `bug`.`identify` = 'requirement' WHERE `bug`.`identify` != 0 AND `object`.`category` NOT IN ('HLDS', 'DDS', 'DBDS', 'ADS', 'QAP', 'CMP', 'ITP', 'ITTC', 'STP', 'STTC', 'UM'); UPDATE `zt_bug` SET `injection` = '' WHERE `injection` = '0'; -UPDATE `zt_bug` SET `identify` = '' WHERE `identify` = '0'; \ No newline at end of file +UPDATE `zt_bug` SET `identify` = '' WHERE `identify` = '0'; + +INSERT INTO `zt_workflowaction` (`group`, `module`, `action`, `method`, `name`, `type`, `batchMode`, `extensionType`, `open`, `position`, `layout`, `show`, `order`, `buildin`, `role`, `virtual`, `conditions`, `verifications`, `hooks`, `linkages`, `js`, `css`, `toList`, `blocks`, `desc`, `status`, `vision`, `createdBy`, `createdDate`, `editedBy`, `editedDate`) VALUES +(0, 'project', 'execution', 'browse', '执行列表', 'single', 'different', 'none', 'normal', 'browse', 'normal', 'direct', 0, 1, 'buildin', 0, NULL, NULL, NULL, NULL, NULL, NULL, '', NULL, NULL, 'enable', 'rnd', 'admin', '2025-01-08 09:41:02', '', NULL); \ No newline at end of file diff --git a/module/holiday/model.php b/module/holiday/model.php index 558951c4e8..5ab0e2f863 100644 --- a/module/holiday/model.php +++ b/module/holiday/model.php @@ -250,6 +250,8 @@ class holidayModel extends model $endTime = strtotime($end); $days = ($endTime - $beginTime) / 86400; + if(!$beginTime) return array(); + $dateList = array(); for($i = 0; $i <= $days; $i ++) $dateList[] = date('Y-m-d', strtotime("+{$i} days", $beginTime));