From d9e251ea2621b25da92a3e25ec6e4d6ce42e6b8f Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Tue, 2 Aug 2022 09:29:33 +0000
Subject: [PATCH] * Fix bug#25416

---
 module/product/control.php       | 2 +-
 module/product/view/all.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index a4a85f41e8..207abe40fd 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1263,7 +1263,7 @@ class product extends control
         $pager = new pager($recTotal, $recPerPage, $pageID);
 
         /* Process product structure. */
-        if($this->config->systemMode == 'classic' and $orderBy == 'program_asc') $orderBy = 'order_asc';
+        if($this->config->systemMode == 'classic' and $orderBy == 'program_asc') $orderBy = 'line_desc,order_asc';
         $productStats     = $this->product->getStats($orderBy, $pager, $browseType, '', 'story', '', $queryID);
         $productStructure = $this->product->statisticProgram($productStats);
         $productLines     = $this->dao->select('*')->from(TABLE_MODULE)->where('type')->eq('line')->andWhere('deleted')->eq(0)->orderBy('`order` asc')->fetchAll();
diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 0ac5a3c677..05bead3ca4 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -131,7 +131,7 @@
           <?php endif;?>
 
           <?php foreach($program as $lineID => $line):?>
-          <?php if(isset($line['lineName'])):?>
+          <?php if(isset($line['lineName']) and isset($line['products']) and is_array($line['products'])):?>
           <?php $lineNames[] = $line['lineName'];?>
           <?php
           if($this->config->systemMode == 'new' and $programID)