Merge branch 'developer' into 'master'

观云台小程序

See merge request !41

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

@@ -110,13 +110,13 @@ public class StoreSearchUtils {
                     }
                 }
                 ServiceResponse<Page<StoreDTO>> pageServiceResponse = this.storeApiService.listStore(storeSearchDTO, 1, 20000);
-                if(pageServiceResponse.isSuccess() && pageServiceResponse.getResult() != null){
+                if(pageServiceResponse.isSuccess() && pageServiceResponse.getResult() != null && CollectionUtils.isNotEmpty(pageServiceResponse.getResult().getResult())){
                     List<StoreDTO> storeDTOList = pageServiceResponse.getResult().getResult();
                     List<Integer> storeInfoIdList = storeDTOList.stream().map(storeDTO -> storeDTO.getStoreInfoId()).collect(Collectors.toList());
                     if(CollectionUtils.isNotEmpty(storeAuth.getStoreInfoIdList())){
                         resultList = storeInfoIdList.stream().filter(s -> {
                             for (Integer storeInfoId : storeAuth.getStoreInfoIdList()) {
-                                if (s.intValue() == storeInfoId.intValue()) {
+                                if (s != null && s.intValue() == storeInfoId.intValue()) {
                                     return true;
                                 }
                             }