Merge branch 'developer' into 'master'

线上权限调整

See merge request !50

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

@@ -67,9 +67,9 @@ public class BaseSalesController {
             Integer newChannel = this.storeSearchUtils.getChannel(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
             qo.setChannel(newChannel);
         }
-        /***********如果是线下的第一层级，需要展示切换层级按钮*************/
+        /***********如果是线下的第一层级或者门店导购层级，需要展示切换层级按钮*************/
         if((qo.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && qo.getLevel() == levelVo.getLevel())
-                || (qo.getChannel() != null && (qo.getChannel() == 7 || qo.getChannel() == 8))){
+                || (qo.getLevel() == 7 || qo.getLevel() == 8)){
             vo.setChangeLevel(1);
         }
         if(qo.getChannel() == null){

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

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