Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4

2023-04-27 09:16:56 +08:00
parent a83cb3fc39 0f230d84a5
commit ec065a3d52
1 changed files with 1 additions and 1 deletions
@@ -4261,7 +4261,7 @@ class executionModel extends model
            ->page($pager, 't1.id')
            ->fetchAll('id');

-        $orderBy = str_replace('pri_', 'priOrder_', $orderBy);
+        $orderBy = str_replace(array('t1.pri_', 't1.`pri'), array('priOrder_', '`priOrder_'), $orderBy);
        $tasks   = $this->dao->select('t1.*, t2.id AS storyID, t2.title AS storyTitle, t2.product, t2.branch, t2.version AS latestStoryVersion, t2.status AS storyStatus, t3.realname AS assignedToRealName, IF(t1.`pri` = 0, 999, t1.`pri`) as priOrder')
             ->from(TABLE_TASK)->alias('t1')
             ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')