From d28ea77f0d9fc4d3766b08bdc49192d8d35a633f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Mon, 19 Dec 2022 14:50:11 +0800 Subject: [PATCH] * code for task #80461. --- module/my/model.php | 2 +- module/task/model.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/my/model.php b/module/my/model.php index 38b1fd9612..bb6ae26b4b 100644 --- a/module/my/model.php +++ b/module/my/model.php @@ -344,7 +344,7 @@ class myModel extends model ->andWhere('t2.deleted')->eq(0) ->andWhere('t1.id')->in(array_keys($objectIDList)) ->orderBy($orderBy) - ->page($pager) + ->page($pager, 't1.id') ->fetchAll('id'); } elseif($objectType == 'requirement' or $objectType == 'story' or $objectType == 'bug') diff --git a/module/task/model.php b/module/task/model.php index 21044959c4..29c8185f55 100755 --- a/module/task/model.php +++ b/module/task/model.php @@ -2635,7 +2635,7 @@ class taskModel extends model ->beginIF($type == 'assignedTo' and $this->app->rawModule == 'my' and $this->app->rawMethod == 'work')->andWhere('t1.status')->notin('closed,cancel,pause')->fi() ->orderBy($orderBy) ->beginIF($limit > 0)->limit($limit)->fi() - ->page($pager) + ->page($pager, 't1.id') ->fetchAll('id'); $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', false);