From 35fbadc19bc6ef7a8733b3e7e4853de7ff48eca8 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 24 Feb 2025 11:04:52 +0800 Subject: [PATCH] * [task#138022,done,0.2h] modify order. --- module/programplan/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/programplan/model.php b/module/programplan/model.php index 4bee45bd76..7a970a5301 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -825,7 +825,7 @@ class programplanModel extends model $this->session->set('projectTaskQueryCondition', $projectTaskQuery, $this->app->tab); $this->session->set('projectTaskOnlyCondition', true, $this->app->tab); - $tasks = $this->loadModel('execution')->getSearchTasks($projectTaskQuery, 'execution_asc,order_asc,id_desc', $pager, 'projectTask'); + $tasks = $this->loadModel('execution')->getSearchTasks($projectTaskQuery, 'execution_asc,order_asc,id_asc', $pager, 'projectTask'); } elseif(!empty($planIdList)) { @@ -834,7 +834,7 @@ class programplanModel extends model ->where('t1.deleted')->eq(0) ->andWhere('t1.project')->eq($projectID) ->andWhere('t1.execution')->in($planIdList) - ->orderBy('execution_asc, order_asc, id_desc') + ->orderBy('execution_asc, order_asc, id_asc') ->fetchAll('id'); }