Merge branch 'master' of git.oschina.net:kollway-kollway/newcemarose

iCemarose/Class/UI/Brand/KWMSearchBrandVC.m

@@ -312,14 +312,16 @@ static NSString *identify = @"KWMSearchBrandsCell";
             return ;
         }
 //        NSArray  *indexArray= [result.brands arrayWithPinYinFirstLetterFormat];
-        if(self.dataArray){ //如果已经从缓存拿到数据了。
-            return;
+//        if(self.dataArray){ //如果已经从缓存拿到数据了。
+//            return;
+//        }
+        if(result.brands){
+            NSArray  *indexArray= [[result.brands rx_filterWithBlock:^BOOL(id each) {
+                return each && each != [NSNull null];
+            }] arrayWithPinYinFirstLetterFormat];
+            _dataArray =[NSMutableArray arrayWithArray:indexArray];
+            [weakSelf.tbvSearchBrand reloadData];
         }
-        NSArray  *indexArray= [[result.brands rx_filterWithBlock:^BOOL(id each) {
-            return each && each != [NSNull null];
-        }] arrayWithPinYinFirstLetterFormat];
-        _dataArray =[NSMutableArray arrayWithArray:indexArray];
-        [weakSelf.tbvSearchBrand reloadData];
     };
     void(^cacheCallback)(KWMBrandsResult *) = ^(KWMBrandsResult *result){
 //        if([weakSelf hasCemaroseError:result]){