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

Merge pull request '修改商品列表查询' (#385) from dev into main

Browse Source 
Reviewed-on: #385
This commit is contained in:
mkm 2024-12-12 14:28:34 +08:00
commit 4159c4bfdb
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/admin/lists/store_product/StoreProductLists.php
View File

@ -71,7 +71,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
$query = StoreProduct::where($this->searchWhere); $query = StoreProduct::where($this->searchWhere);
if (isset($this->params['type_filter'])) { if (isset($this->params['type_filter'])) {
if ($this->params['type_filter'] == 0) { if ($this->params['type_filter'] == 0) {
$query->where('product_type', 6)->where('is_show', 0); $query->where(function ($query) {
$query->where('product_type', 6)->whereOr('is_show', 0);
});
} else { } else {
$query->where('is_show', 1); $query->where('is_show', 1);
} }
@ -156,7 +158,17 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
} }
} }
} }
return StoreProduct::where($this->searchWhere)->count(); $query = StoreProduct::where($this->searchWhere);
if (isset($this->params['type_filter'])) {
if ($this->params['type_filter'] == 0) {
$query->where(function ($query) {
$query->where('product_type', 6)->whereOr('is_show', 0);
});
} else {
$query->where('is_show', 1);
}
}
return $query->count();
} }
/** /**