Merge branch 'haow/dev' into 'test'

fix code

See merge request alpha/sun!261

api/brand.py

@@ -35,7 +35,7 @@ class BrandListView(APIView):
                     category_dict[str(obj_id)] = [obj]
 
         classify_infos = self.rpc['neptune/commodity/classify/infos'](brand_ids=brand_ids).unwrap()
-        classify_dict = {str(obj.get('brand_id')): obj for obj in classify_infos}
+        classify_dict = {str(obj.get('brand_id')): obj for obj in classify_infos} if classify_infos else {}
         
         for obj in data:
             brand_id = obj.get('id')