1

app/common/repositories/store/product/ProductRepository.php

@@ -1432,6 +1432,7 @@ class ProductRepository extends BaseRepository
             ->each(function ($item) {
                 $item->sys_labels = $item->sys_labels ? explode(',', rtrim(ltrim($item->sys_labels, ','), ',')) : [];
             })->append(['us_status']);
+        @file_put_contents('quanju.txt',$query->getLastSql()."-列表sql\r\n",8);
         return compact('count', 'list');
     }
 

app/controller/admin/store/StoreProduct.php

@@ -57,6 +57,13 @@ class StoreProduct extends BaseController
         $mer_id = $this->request->param('mer_id', '');
         $merId = $mer_id ?: null;
         $where['is_gift_bag'] = 0;
+        if ($where['is_ficti']==1){
+            $where['is_ficti'] = 0;
+            $where['is_gift'] = 1;
+        }elseif ($where['is_ficti']==2){
+            $where['is_ficti'] = 0;
+            $where['is_oil'] = 1;
+        }
         $_where = $this->repository->switchType($type, null, 0);
         unset($_where['star']);
         $where = array_merge($where, $_where);