From eddd75f15af6c36813ae3e5d21ed965fa887da88 Mon Sep 17 00:00:00 2001 From: tianshujie98 Date: Wed, 31 Mar 2021 16:32:06 +0800 Subject: [PATCH] * Fix bug #11157. --- module/product/model.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/product/model.php b/module/product/model.php index ae59211dc9..37612d6bab 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -261,14 +261,14 @@ 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') - ->from(TABLE_PRODUCT) - ->where('deleted')->eq(0) - ->beginIF($programID)->andWhere('program')->eq($programID)->fi() - ->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) + $products = $this->dao->select('*, IF(INSTR(" closed", t1.status) < 2, 0, 1) AS isClosed, t1.id AS id, t1.name AS name') + ->from(TABLE_PRODUCT)->alias('t1') + ->leftJoin(TABLE_PROGRAM)->alias('t2')->on('t1.program = t2.id') + ->where('t1.deleted')->eq(0) + ->beginIF($programID)->andWhere('t1.program')->eq($programID)->fi() + ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t1.status')->ne('closed')->fi() + ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->products)->fi() + ->orderBy('t2.order_asc, t1.line_desc, t1.order_asc') ->fetchPairs('id', 'name'); return $products; }