Merge branch 'sprint/hufangzhou_productOrder' into 'master'

* Make the order of products in the product drop-down consistent with the product list. See merge request easycorp/zentaopms!3836
2022-06-09 09:22:27 +00:00
parent f02350122a 4385eab733
commit 25a79b513b
1 changed files with 1 additions and 1 deletions
@@ -278,7 +278,7 @@ class productModel extends model
            ->orWhere('t1.createdBy')->eq($this->app->user->account)
            ->markRight(1)
            ->fi()
-            ->orderBy('t1.program_asc,t1.order_asc')
+            ->orderBy('t2.order_asc, t1.line_desc, t1.order_desc')
            ->beginIF($limit > 0)->limit($limit)->fi()
            ->fetchAll('id');
    }