shish 3 лет назад
Родитель
Сommit
d04f0c4686
1 измененных файлов с 1 добавлено и 0 удалено
  1. 1 0
      app-hd/controllers/ShopController.php

+ 1 - 0
app-hd/controllers/ShopController.php

@@ -51,6 +51,7 @@ class ShopController extends BaseController
             $addShopList = ShopClass::getAllByCondition(['mainId' => ['in', $mainIdList]], null, 'id,shopName,merchantName,sjId,mainId', 'id');
         }
         $all = array_merge($shopList, $addShopList);
+        $all = array_unique($all);
         $list = array_values($all);
         util::success(['list' => $list]);
     }