Merge branch 'developer' into 'master'

观云台小程序

See merge request !15

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

@@ -76,6 +76,14 @@ public class GoDownComponent {
         if(params.getLevel() == null){
             params.setLevel(levelVo.getLevel());
         }
+        if(params.getLevel().intValue() > levelVo.getMaxLevel().intValue()){
+            if(params.getLevel().intValue()- levelVo.getMaxLevel().intValue() == 1){
+                params.setLevel(7);
+            }
+            if(params.getLevel().intValue()- levelVo.getMaxLevel().intValue() == 2){
+                params.setLevel(8);
+            }
+        }
         /***********如果是线下的第一层级，需要展示切换层级按钮*************/
         if(params.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && params.getLevel() == levelVo.getLevel()){
             vo.setChangeLevel(1);
@@ -171,7 +179,7 @@ public class GoDownComponent {
                     BaseDTO baseSalesDTO = (BaseDTO) b;
                     baseSalesDTO.setLevel(level);
                     baseSalesDTO.setChannel(StoreChannelEnum.OFFLINE.getChannel());
-                    baseSalesDTO.setHasChildren(level < maxLevel ? 1 : 0);
+                    baseSalesDTO.setHasChildren(level <= (maxLevel+1) ? 1 : 0);
                 });
             }
         }