From 0a5264547c25b63a995c6aba6a47b9b75c3daeb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Thu, 11 Jan 2018 23:13:27 +0800 Subject: [PATCH] * Finish Task#3586. --- module/todo/model.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/todo/model.php b/module/todo/model.php index 96fb105c64..1c95418afa 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -375,7 +375,11 @@ class todoModel extends model if($account == '') $account = $this->app->user->account; $stmt = $this->dao->select('*')->from(TABLE_TODO) - ->where('account')->eq($account) + ->where('1') + ->andWhere('account', true)->eq($account) + ->orWhere('assignedTo')->eq($account) + ->orWhere('finishedBy')->eq($account) + ->markRight(1) ->beginIF($begin)->andWhere('date')->ge($begin)->fi() ->beginIF($end)->andWhere('date')->le($end)->fi() ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->in($status)->fi()