观云台小程序

761a3001 · 陶光胜 · c910778d · 761a3001
Commit 761a3001 authored Aug 03, 2020 by 陶光胜
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

BaseSalesController.java ...ava/com/gic/cloud/web/controller/BaseSalesController.java +1 -1

No files found.
--- a/gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java
+++ b/gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/BaseSalesController.java
@@ -74,7 +74,7 @@ public class BaseSalesController {
            total.setName("合计");
            vo.setTotal(total);
        }
-        if(channel == 1 && parentId == null){
+        if(channel != null && channel == 1 && parentId == null){
            dto.setCountType(3); //无归属
            ServiceResponse<Page<BaseSalesDTO>> response2 = this.baseSalesApiService.pageBaseSales(dto);
            if(response2.isSuccess() && response2.getResult() != null && CollectionUtils.isNotEmpty(response2.getResult().getResult())){