Merge branch 'developer' into 'master'

观云台小程序

See merge request !18

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

@@ -97,15 +97,15 @@ public class BaseSalesController {
         log.info("response:{}", JSON.toJSONString(response));
         vo.setPage(this.goDownComponent.parseData(response.getResult(), qo.getChannel(), qo.getEnterpriseId(), qo.getLevel(), maxLevel));
         dto.setCountType(2);//合计
+        Integer wgs = storeSearchUtils.isWgs(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
         /**所有渠道或者线下渠道第一层级 合计算上无归属数据**/
-        if(qo.getChannel() == null || (qo.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && qo.getLevel() == levelVo.getLevel())){
+        if((qo.getChannel() == null || (qo.getChannel() == StoreChannelEnum.OFFLINE.getChannel() && qo.getLevel() == levelVo.getLevel())) && wgs == 1){
             dto.getStoreInfoIdList().add(-1);
             dto.getOnLine().add("-1");
         }
         ServiceResponse<Page<BaseSalesDTO>> totalResponse = this.baseSalesApiService.pageBaseSales(dto);
         log.info("totalResponse:{}", JSON.toJSONString(totalResponse));
         this.goDownComponent.parseTotal(totalResponse, vo);
-        Integer wgs = storeSearchUtils.isWgs(qo.getUserId(), qo.getEnterpriseId(), qo.getSearchJSON());
         if(qo.getChannel() != null && qo.getChannel() == 1 && qo.getLevel() == levelVo.getLevel() && wgs == 1){
             dto.setCountType(3); //无归属
             dto.setChannel(null);