Skip to content

Commit

Permalink
Merge branch 'sprint/liumengyi_modify' into 'master'
Browse files Browse the repository at this point in the history
* Modify getUserSuspendTasks.

See merge request easycorp/zentaopms!1854
  • Loading branch information
孙广明 committed Feb 18, 2022
2 parents 3f41b44 + fe8f6bb commit 562b983
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion module/task/model.php
Original file line number Diff line number Diff line change
Expand Up @@ -2267,7 +2267,7 @@ public function getUserSuspendedTasks($account)
->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on("t1.execution = t2.id")
->leftJoin(TABLE_PROJECT)->alias('t3')->on("t1.project = t3.id")
->where('t1.assignedTo')->eq($this->app->user->account)
->where('t1.assignedTo')->eq($account)
->andWhere('(t2.status')->eq('suspended')
->orWhere('t3.status')->eq('suspended')
->markRight(1)
Expand Down

0 comments on commit 562b983

Please sign in to comment.