From 3c9eeff598f8690cf082fcbf54dfd3f6c1c3a951 Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Thu, 28 Dec 2023 13:58:55 +0800 Subject: [PATCH] * Add project param for getNewParentAndAction method. --- module/programplan/model.php | 2 +- module/programplan/tao.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/programplan/model.php b/module/programplan/model.php index e92752adc9..5a36d6d3d0 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -957,7 +957,7 @@ class programplanModel extends model if(empty($statusCount)) continue; - $result = $this->programplanTao->getNewParentAndAction($statusCount, $parent, (int)$startTasks, $action); + $result = $this->programplanTao->getNewParentAndAction($statusCount, $parent, (int)$startTasks, $action, $project); $newParent = $result['newParent'] ?? null; $parentAction = $result['parentAction'] ?? ''; diff --git a/module/programplan/tao.php b/module/programplan/tao.php index 9533b2c0f5..661a5f02b6 100644 --- a/module/programplan/tao.php +++ b/module/programplan/tao.php @@ -82,10 +82,11 @@ class programplanTao extends programplanModel * @param object $parent * @param int $startTasks * @param string $action + * @param object $project * @access protected * @return array */ - protected function getNewParentAndAction(array $statusCount, object $parent, int $startTasks, string $action): array + protected function getNewParentAndAction(array $statusCount, object $parent, int $startTasks, string $action, object $project): array { $count = count($statusCount); $newParent = null;