sjId 改为 shopId

biz/item/classes/PtItemClass.php

@@ -15,14 +15,14 @@ class PtItemClass extends BaseClass
     public static $baseFile = '\biz\item\models\PtItem';
 
     //列表数据
-    public static function getItemList($where, $showSelect = false, $sjId = '')
+    public static function getItemList($where, $showSelect = false, $shopId = '')
     {
         $data = self::getList('*', $where, 'inTurn DESC');
         $list = $data['list'];
         $sjItemIds = [];
         $sjItems = [];
-        if ($showSelect && $sjId) {
-            $sjItemIds = ProductClass::getAllByCondition($where = ['sjId' => $sjId], null, "*");
+        if ($showSelect && $shopId) {
+            $sjItemIds = ProductClass::getAllByCondition($where = ['shopId' => $shopId], null, "*");
 
             foreach($sjItemIds as $item) {
                 $sjItems[$item['itemId']] = ['ghsItemId' => $item['id'], 'delStatus' => $item['delStatus']];
@@ -47,7 +47,7 @@ class PtItemClass extends BaseClass
                     $list[$k]['select'] = key_exists($v['id'], $sjItems) ? 2 : 1;
                     //0显示（未删除） 1不显示（删除）
                     $list[$k]['is_delete'] = isset($sjItems[$v['id']]['delStatus']) ? ($sjItems[$v['id']]['delStatus'] == 1 ? 1 : 0) : 0;
-                    $list[$k]['ghs_item_id'] = $sjItems[$v['id']]['ghsItemId'];
+                    $list[$k]['ghs_item_id'] = $sjItems[$v['id']]['ghsItemId'] ?? 0;
                 }
             }
         }