Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/editor/components/drawer/mixDrawer/index.tsx

@@ -129,7 +129,10 @@ const MixDrawer: React.FC<MixDrawerProps> = (props: MixDrawerProps) => {
           _params.name = keyWord
         }
         _params.shopId = shopId
-        _params.idNotInList = selectId
+        if (selectId && Array.isArray(selectId) && selectId.length > 0) {
+          _params.idNotInList = selectId.join(',')
+        }
+
         _fetch = PublicApi.getSearchCommodityTemplateGetBrandList;
         break;
     }

src/pages/mobileTemplate/ownMallTemplateEdit/index.tsx

@@ -155,16 +155,18 @@ const OwnMallTempleteEdit: React.FC<ShopPreviewPropsType> = props => {
   };
 
   const getBrandList = async (ids: number[]) => {
-    const param: any = {
-      current: 1,
-      pageSize: 20,
-      shopId,
-      idInList: ids
-    };
-    const res = await PublicApi.getSearchCommodityTemplateGetBrandList(param);
-    message.destroy()
-    if (res.code === 1000 && res.data.data) {
-      return res.data.data
+    if (ids && ids.length > 0) {
+      const param: any = {
+        current: 1,
+        pageSize: 20,
+        shopId,
+        idInList: ids.join(',')
+      };
+      const res = await PublicApi.getSearchCommodityTemplateGetBrandList(param);
+      message.destroy()
+      if (res.code === 1000 && res.data.data) {
+        return res.data.data
+      }
     }
     return [];
   };