Merge branch 'sprint/tianshujie_fixbug' into 'master'

* Fix bug #23358. See merge request easycorp/zentaopms!3768
2022-06-07 06:49:05 +00:00
parent b2a576b958 ee2d74d99d
commit c8c1bfc4c0
1 changed files with 2 additions and 1 deletions
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -397,7 +397,8 @@ class productplan extends control
        if($this->app->getViewType() == 'xhtml') $recPerPage = 10;

        /* Append id for secend sort. */
-        $sort = common::appendOrder($orderBy);
+        $orderBy = ($type == 'bug' and $orderBy == 'order_desc') ? 'id_desc' : $orderBy;
+        $sort    = common::appendOrder($orderBy);

        $this->commonAction($plan->product, $plan->branch);
        $products = $this->product->getProductPairsByProject($this->session->project);