观云台小程序

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/StoreSearchUtils.java

@@ -2,6 +2,8 @@ package com.gic.cloud.web.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.gic.api.base.commons.Page;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.cloud.dto.AttentionStoreDTO;
 import com.gic.cloud.dto.TempStoreConditionDTO;
 import com.gic.cloud.service.StoreAttentionApiService;
@@ -79,19 +81,22 @@ public class StoreSearchUtils {
                         storeSearchDTO.setStoreIdsOfNot(StringUtils.join(tempStoreIdList, ","));
                     }
                 }
-                List<StoreDTO> storeDTOList = this.storeApiService.listStore(storeSearchDTO, 1, 20000).getResult().getResult();
-                List<Integer> storeInfoIdList = storeDTOList.stream().map(storeDTO -> storeDTO.getStoreInfoId()).collect(Collectors.toList());
-                if(CollectionUtils.isNotEmpty(storeAuth.getStoreInfoIdList())){
-                    return storeInfoIdList.stream().filter(s -> {
-                        for(Integer storeInfoId : storeAuth.getStoreInfoIdList()){
-                            if(s.intValue() == storeInfoId.intValue()){
-                                return true;
+                ServiceResponse<Page<StoreDTO>> pageServiceResponse = this.storeApiService.listStore(storeSearchDTO, 1, 20000);
+                if(pageServiceResponse.isSuccess() && pageServiceResponse.getResult() != null){
+                    List<StoreDTO> storeDTOList = pageServiceResponse.getResult().getResult();
+                    List<Integer> storeInfoIdList = storeDTOList.stream().map(storeDTO -> storeDTO.getStoreInfoId()).collect(Collectors.toList());
+                    if(CollectionUtils.isNotEmpty(storeAuth.getStoreInfoIdList())){
+                        return storeInfoIdList.stream().filter(s -> {
+                            for(Integer storeInfoId : storeAuth.getStoreInfoIdList()){
+                                if(s.intValue() == storeInfoId.intValue()){
+                                    return true;
+                                }
                             }
-                        }
-                        return false;
-                    }).collect(Collectors.toList());
-                }else {
-                    return storeInfoIdList;
+                            return false;
+                        }).collect(Collectors.toList());
+                    }else {
+                        return storeInfoIdList;
+                    }
                 }
             }
         }