dev #18

Merged
mkm merged 2 commits from dev into main 2025-04-16 17:18:48 +08:00
Showing only changes of commit eb24c561ad - Show all commits

View File

@ -181,9 +181,7 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
*/ */
public function count(): int public function count(): int
{ {
$export = $this->request->get('export');
$query = StoreProduct::where($this->searchWhere); $query = StoreProduct::where($this->searchWhere);
if ($export == 1) {
$class_all = $this->request->get('class_all'); $class_all = $this->request->get('class_all');
if ($class_all) { if ($class_all) {
if (count($class_all) == 1) { if (count($class_all) == 1) {
@ -196,7 +194,6 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
$query->where('cate_id', $class_all[2]); $query->where('cate_id', $class_all[2]);
} }
} }
}
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(function ($query) { $query->where(function ($query) {