shish 5 лет назад
Родитель
Сommit
5eeccc0d77
1 измененных файлов с 9 добавлено и 6 удалено
  1. 9 6
      app-ghs/controllers/ProductController.php

+ 9 - 6
app-ghs/controllers/ProductController.php

@@ -15,6 +15,7 @@ use bizGhs\product\classes\ProductClass;
 use bizGhs\product\services\ProductService;
 use bizGhs\item\services\ItemService;
 use common\components\noticeUtil;
+use common\components\stringUtil;
 use common\components\util;
 use Yii;
 
@@ -74,17 +75,19 @@ class ProductController extends BaseController
     public function actionList()
     {
         $classId = Yii::$app->request->get('classId', 0);
-        $pyName = Yii::$app->request->get('py', '');
 //        $itemInfo = ItemClass::getGhsItemAll($this->sjId);
 //        $itemIds = array_column($itemInfo, 'itemId');
         $where['sjId'] = $this->sjId;
 
-        if ($pyName) {
-//            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
-//            $itemIds = array_intersect($itemIds, $pyNameItemIds);
-            $pyName = strtolower($pyName);
-            $where['py'] = $pyName;
+        $name = Yii::$app->request->get('name', '');
+        if (!empty($name)) {
+            if (stringUtil::isLetter($name)) {
+                $where['py'] = ['like', $name];
+            } else {
+                $where['name'] = ['like', $name];
+            }
         }
+
         if ($classId) {
             //获取itemIds
             //$itemIds = ItemClass::getItemIdsByClassId($this->sjId, $classId);