diff --git a/application/common/Model/Task.php b/application/common/Model/Task.php index 2e18936..8e4e1ca 100644 --- a/application/common/Model/Task.php +++ b/application/common/Model/Task.php @@ -568,6 +568,7 @@ class Task extends CommonModel } return $tags; } + /** * 子任务数 */ @@ -591,7 +592,7 @@ class Task extends CommonModel $done = 1; if (isset($data['code']) && isset($data['pcode']) && $data['pcode']) { $task = self::where(['code' => $data['pcode']])->field('done')->find(); - if ($task && !$task['done']) { + if ($task && !$task['deleted'] && !$task['done']) { $done = 0; } } @@ -605,7 +606,7 @@ class Task extends CommonModel { $hasUnDone = 0; if (isset($data['code'])) { - $taskCount = self::where(['pcode' => $data['code'], 'done' => 0])->count('id'); + $taskCount = self::where(['pcode' => $data['code'], 'done' => 0, 'deleted' => 0])->count('id'); if ($taskCount) { $hasUnDone = 1; } diff --git a/config/app.php b/config/app.php index 514fc5f..8c8ebe2 100644 --- a/config/app.php +++ b/config/app.php @@ -6,7 +6,7 @@ return [ // 应用名称 'app_name' => 'pearProject', // 应用版本 - 'app_version' => '2.2.4', + 'app_version' => '2.2.5', // 应用地址 'app_host' => '', // 应用调试模式