From 121547d30e0616530bea456c31c2d41e7a609082 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Wed, 6 Nov 2024 08:45:53 +0000
Subject: [PATCH]  * [task#131937,doing,0.5h] add filter condition.

---
 module/task/model.php | 4 ++--
 module/task/zen.php   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/module/task/model.php b/module/task/model.php
index 3d508489c8..a65c533298 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1914,7 +1914,7 @@ class taskModel extends model
         /*
          过滤多人任务。
          过滤已经记录工时的任务。
-         过滤已暂停、已取消、已关闭的任务。
+         过滤已取消、已关闭的任务。
          过滤自己和后代任务。
         */
         $children = $this->getAllChildId($taskID);
@@ -1922,7 +1922,7 @@ class taskModel extends model
         return $this->dao->select('id, name')->from(TABLE_TASK)
             ->where('deleted')->eq(0)
             ->andWhere('consumed')->eq(0)
-            ->andWhere('status')->notin('pause,cancel,closed')
+            ->andWhere('status')->notin('cancel,closed')
             ->andWhere('execution')->eq($executionID)
             ->andWhere('mode')->eq('')
             ->beginIF($children)->andWhere('id')->notin($children)->fi()
diff --git a/module/task/zen.php b/module/task/zen.php
index de1393f84f..0f414e6f71 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -275,7 +275,7 @@ class taskZen extends task
         $task = $this->view->task;
 
         /* Get the task parent id,name pairs. */
-        $tasks = $this->task->getParentTaskPairs($this->view->execution->id, strVal($task->parent));
+        $tasks = $this->task->getParentTaskPairs($this->view->execution->id, strVal($task->parent), $taskID);
         if(isset($tasks[$taskID])) unset($tasks[$taskID]);
 
         /* Prepare to assign to relevant parameters. */