花材列表

app-ghs/controllers/ProductController.php

@@ -76,14 +76,15 @@ class ProductController extends BaseController
         util::success($data);
     }
 
-
     //当前门店所有花材
     public function actionList()
     {
-        $classId = Yii::$app->request->get('classId', 0);
-//        $itemInfo = ItemClass::getGhsItemAll($this->sjId);
-//        $itemIds = array_column($itemInfo, 'itemId');
+        $where = [];
         $where['sjId'] = $this->sjId;
+        $classId = Yii::$app->request->get('classId', 0);
+        if (!empty($classId)) {
+            $where['classId'] = $classId;
+        }
 
         $name = Yii::$app->request->get('name', '');
         if (empty($name)) {
@@ -97,13 +98,6 @@ class ProductController extends BaseController
                 $where['name'] = ['like', $name];
             }
         }
-
-        if ($classId) {
-            //获取itemIds
-            //$itemIds = ItemClass::getItemIdsByClassId($this->sjId, $classId);
-            //$where['itemId'] = ['in', $itemIds];
-            $where['classId'] = $classId;
-        }
         $shopId = Yii::$app->request->get('shopId', 0);
         if (!$shopId) {
             $shopId = $this->shopId;
@@ -125,7 +119,6 @@ class ProductController extends BaseController
             } else {
                 $respond = ProductClass::getList("*", $where, "inTurn desc");
             }
-
             $respond['list'] = ProductClass::groupProductInfo($respond['list']);
             $respond['list'] = ProductClass::groupClassName($this->sjId, $respond['list']);
             util::success($respond);
@@ -137,7 +130,6 @@ class ProductController extends BaseController
             $data = ProductClass::getAllByCondition($where, ['actualSold' => SORT_DESC, 'inTurn' => SORT_DESC], "*");
         }
 
-
         $data = ProductClass::groupProductInfo($data);
         $data = ProductClass::groupClassName($this->sjId, $data);