From 461eb3e01040a3b6b04481f55ec3e8221c40d3fc Mon Sep 17 00:00:00 2001 From: "chencongzhi520@gmail.com" Date: Tue, 2 Jul 2013 01:29:23 +0000 Subject: [PATCH] * finish task#1456. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index d0ddd8bd8e..53fa7cf60d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -694,7 +694,7 @@ class taskModel extends model ->leftJoin(TABLE_USER)->alias('t3')->on('t1.assignedTo = t3.account') ->where('t1.project')->eq((int)$projectID) ->andWhere('t1.deleted')->eq(0) - ->beginIF($type == 'undone')->andWhere("t1.status = 'wait'")->orWhere("t1.status = 'doing'")->fi() + ->beginIF($type == 'undone')->andWhere("(t1.status = 'wait' or t1.status ='doing')")->fi() ->beginIF($type == 'needconfirm')->andWhere('t2.version > t1.storyVersion')->andWhere("t2.status = 'active'")->fi() ->beginIF($type == 'assignedtome')->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi() ->beginIF($type == 'finishedbyme')->andWhere('t1.finishedby')->eq($this->app->user->account)->fi()