Merge branch 'developer' into 'master'

Developer

See merge request !37

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

@@ -68,7 +68,8 @@ public class BaseSalesController {
             qo.setChannel(newChannel);
         }
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
-        if(qo.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && qo.getLevel() == levelVo.getLevel()){
+        if((qo.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && qo.getLevel() == levelVo.getLevel())
+                || (qo.getChannel() != null && (qo.getChannel() == 7 || qo.getChannel() == 8))){
             vo.setChangeLevel(1);
         }
         if(qo.getChannel() == null){

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

@@ -102,7 +102,8 @@ public class GoDownComponent {
             params.setChannel(newChannel);
         }
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
-        if(params.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && params.getLevel() == levelVo.getLevel()){
+        if(params.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && params.getLevel() == levelVo.getLevel()
+                || (params.getChannel() != null && (params.getChannel() == 7 || params.getChannel() == 8))){
             vo.setChangeLevel(1);
         }
         if(params.getChannel() == null){