mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
monanxiao 2023-03-14 18:22:17 +08:00
commit 5e825c90a4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crmeb/traits/CategoresDao.php
View File

@ -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();