Merge remote-tracking branch 'origin/developer' into developer

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

@@ -93,7 +93,14 @@ public class GoDownComponent {
                 params.setLevel(7);
             }
         }
-        params.setGroupIdList(storeSearchUtils.getChildrenStoreGroupIdList(params.getEnterpriseId(), params.getParentId(), params.getLevel()));
+        List<Integer> childrenStoreGroupIdList = this.storeSearchUtils.getChildrenStoreGroupIdList(params.getEnterpriseId(), params.getParentId(), params.getLevel());
+        params.setGroupIdList(childrenStoreGroupIdList);
+        /****首页进入基础页面时，如果渠道为空，根据当前条件判断渠道，channel==null表示多渠道***/
+        if(params.getChannel() == null){
+            /**********设置层级名称，只有在首次进入页面会展示，下钻均显示返回上一级*********/
+            Integer newChannel = this.storeSearchUtils.getChannel(params.getUserId(), params.getEnterpriseId(), params.getSearchJson());
+            params.setChannel(newChannel);
+        }
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
         if(params.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && params.getLevel() == levelVo.getLevel()){
             vo.setChangeLevel(1);