From 7ebc83744342724a5d5ed859dd6df0943674f76d Mon Sep 17 00:00:00 2001
From: Yagami <sgm0422@qq.com>
Date: Tue, 22 Jan 2019 15:45:20 +0800
Subject: [PATCH] * Finish task #5213.

---
 module/product/model.php | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index c971f6294f..8ea051a61a 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -291,14 +291,33 @@ class productModel extends model
         if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getProductPairs();
 
         $orderBy  = !empty($this->config->product->orderBy) ? $this->config->product->orderBy : 'isClosed';
-        $products = $this->dao->select('*,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
+        $products = $this->dao->select('id,name,line,  IF(INSTR(" closed", status) < 2, 0, 1) AS isClosed')
             ->from(TABLE_PRODUCT)
             ->where('deleted')->eq(0)
             ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
             ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->products)->fi()
-            ->orderBy($orderBy)
-            ->fetchPairs('id', 'name');
-        return $products;
+            ->orderBy('order_desc')
+            ->fetchAll('id');
+
+        $lines = $this->loadModel('tree')->getLinePairs();
+        $linePairs = array();
+        foreach($lines as $id => $name)
+        {
+            foreach($products as $key => $product)
+            {
+                if($product->line == $id)
+                {
+                    $linePairs[$product->id] = $name . '/' . $product->name;
+                    unset($products[$key]);
+                }
+            }
+        }
+
+        $productPairs = array();
+        foreach($products as $id => $product) $productPairs[$product->id] = $product->name;
+        $productPairs = $linePairs + $productPairs;
+
+        return $productPairs;
     }
 
     /**