From 184487684580a3f5ce54677b4a71f17eba4e331a Mon Sep 17 00:00:00 2001 From: monanxiao Date: Tue, 14 Mar 2023 18:21:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E9=87=87=E8=B4=AD=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E4=B8=B4=E6=97=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/traits/CategoresDao.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/crmeb/traits/CategoresDao.php b/crmeb/traits/CategoresDao.php index b9e972df..07945c53 100644 --- a/crmeb/traits/CategoresDao.php +++ b/crmeb/traits/CategoresDao.php @@ -84,6 +84,11 @@ trait CategoresDao */ public function getAll($mer_id = 0,$status = null, $source = 2) { + + return $this->getModel()::getDB()->where('mer_id', $mer_id)->when(($status !== null),function($query)use($status){ + $query->where($this->getStatus(),$status); + })->order('sort DESC,'.$this->getPk().' DESC')->select(); + // 验证来源 1 小组服务 2 普通来源 if($source == 1) { @@ -99,7 +104,6 @@ trait CategoresDao })->order('sort DESC,'.$this->getPk().' DESC')->select(); }else{ - \think\facade\Log::record('普通访问'); return $this->getModel()::getDB()->where('mer_id', $mer_id)->when(($status !== null),function($query)use($status){ $query->where($this->getStatus(),$status); })->order('sort DESC,'.$this->getPk().' DESC')->select();