Browse Source

Merge remote-tracking branch 'origin/master'

yumeng 4 years ago
parent
commit
1460f1c89a

+ 9 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/report/controller/KuaiShouAccountReportCtrl.java

@@ -51,6 +51,9 @@ public class KuaiShouAccountReportCtrl {
         String mediaId = requestBody.getString("mediaId");
         BigDecimal discount = requestBody.getBigDecimal("discount");
         JSONArray accounts = requestBody.getJSONArray("accountIds");
+        if(accounts.isEmpty()){
+            return resultBody;
+        }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
         try {
@@ -80,6 +83,9 @@ public class KuaiShouAccountReportCtrl {
         String mediaId = requestBody.getString("mediaId");
         BigDecimal discount = requestBody.getBigDecimal("discount");
         JSONArray accounts = requestBody.getJSONArray("accountIds");
+        if(accounts.isEmpty()){
+            return result;
+        }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
         int hour= requestBody.getInteger("hour");
@@ -117,6 +123,9 @@ public class KuaiShouAccountReportCtrl {
         columns.add(1,"authName");
         String mediaId = requestBody.getString("mediaId");
         JSONArray accounts = requestBody.getJSONArray("accountIds");
+        if(accounts.isEmpty()){
+            return;
+        }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
         String target= requestBody.getString("target");

+ 9 - 0
module-toutiao/src/main/java/cn/com/ctop/toutiao/modules/report/controller/BytedanceAccountReportCtrl.java

@@ -53,6 +53,9 @@ public class BytedanceAccountReportCtrl {
         String mediaId = requestBody.getString("mediaId");
         BigDecimal discount = requestBody.getBigDecimal("discount");
         JSONArray accounts = requestBody.getJSONArray("accountIds");
+        if(accounts.isEmpty()){
+         return resultBody;
+        }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
         try {
@@ -84,6 +87,9 @@ public class BytedanceAccountReportCtrl {
         String mediaId = requestBody.getString("mediaId");
         BigDecimal discount = requestBody.getBigDecimal("discount");
         JSONArray accounts = requestBody.getJSONArray("accountIds");
+        if(accounts.isEmpty()){
+            return result;
+        }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
         int hour= requestBody.getInteger("hour");
@@ -124,6 +130,9 @@ public class BytedanceAccountReportCtrl {
         columns.add(1,"authName");
         String mediaId = requestBody.getString("mediaId");
         JSONArray accounts = requestBody.getJSONArray("accountIds");
+        if(accounts.isEmpty()){
+            return;
+        }
         String startDate = requestBody.getString("startDate");
         String endDate = requestBody.getString("endDate");
         String target= requestBody.getString("target");