更新

app-ghs/controllers/ShopController.php

@@ -48,7 +48,7 @@ class ShopController extends BaseController
             $sjId = $this->sjId ?? 0;
             $shopList = ShopClass::getAllByCondition(['sjId' => $sjId, 'ptStyle' => 2], null, 'id,shopName,merchantName,sjId,mainId,ptStyle', 'id');
         }
-        $adminId = $this->adminId ?? 0;
+        $adminId = $this->adminId;
         $staffList = ShopAdminClass::getAllByCondition(['adminId' => $adminId], null, '*', null, true);
         $mainIdList = [];
         if (!empty($staffList)) {
@@ -67,7 +67,7 @@ class ShopController extends BaseController
             if (!empty($addShopList)) {
                 foreach ($addShopList as $addShop) {
                     $addShopId = $addShop['id'] ?? 0;
-                    if (isset($shopList[$addShopId]) == false) {
+                    if (!isset($shopList[$addShopId])) {
                         $shopList[$addShopId] = $addShop;
                     }
                 }