Merge branch 'sprint/193_hufangzhou_54990' into 'master'

* Finish task #54990. See merge request easycorp/zentaopms!3585
2022-05-25 07:09:26 +00:00
parent b68c2e6a80 80c73a6f83
commit 137085feed
1 changed files with 1 additions and 1 deletions
@@ -270,7 +270,7 @@ class productModel extends model
            ->orWhere('t1.createdBy')->eq($this->app->user->account)
            ->markRight(1)
            ->fi()
-            ->orderBy('t1.order_asc')
+            ->orderBy('t1.program_asc,t1.order_asc')
            ->beginIF($limit > 0)->limit($limit)->fi()
            ->fetchAll('id');
    }