观云台小程序

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

@@ -149,16 +149,18 @@ public class StoreSearchUtils {
     private void getOnlineStoreIds(String searchJson, OnLineAuth onlineStoreAuth, List<String> list, Integer channel){
         StoreSearchQo searchQo = JSON.parseObject(searchJson).getObject(channel.toString(), StoreSearchQo.class);
         log.info("getOnlineStoreIds:{},{}", searchJson, JSON.toJSONString(searchQo));
-        if(searchQo != null && searchQo.getAll() == 1){
-            onlineStoreAuth.getList().stream().filter(s -> {
-                if(s.getChannel() == channel){
-                    list.addAll(s.getStoreIdList());
+        if(searchQo != null){
+            if(searchQo.getAll() == 1){
+                onlineStoreAuth.getList().stream().filter(s -> {
+                    if(s.getChannel() == channel){
+                        list.addAll(s.getStoreIdList());
+                    }
+                    return false;
+                });
+            }else {
+                if(StringUtils.isNotBlank(searchQo.getStoreGroupIds())){
+                    list.addAll(Arrays.asList(searchQo.getStoreGroupIds().split(",")));
                 }
-                return false;
-            });
-        }else {
-            if(StringUtils.isNotBlank(searchQo.getStoreGroupIds())){
-                list.addAll(Arrays.asList(searchQo.getStoreGroupIds().split(",")));
             }
         }
     }