周月报空处理

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/adaptor/WeekMonthDataAdaptor.java

@@ -124,17 +124,20 @@ public class WeekMonthDataAdaptor {
         String clerkId = context.getClerkId();
         Integer reportType = context.getReportType();
         List<String> rightMenuCodeList = context.getRightMenuCodeList();
+        MaterialDataResult emptyResult = MaterialDataResult.buildEmpty();
         if (CollectionUtils.isEmpty(rightMenuCodeList)) {
-            return MaterialDataResult.buildEmpty();
+            return emptyResult;
         }
         if (rightMenuCodeList.size() > 1) {
             MaterialDataResult contentResult = queryAreaReportDataContent(enterpriseId, clerkId, storeIds, reportType, bizDate);
             MaterialDataResult potentialResult = queryReportDataPotential(enterpriseId, clerkId, storeIds, reportType, bizDate);
-            return new MaterialDataResult(potentialResult.getFirstValue(),contentResult.getSecondValue());
+            return new MaterialDataResult(
+                    Optional.ofNullable(potentialResult).orElse(emptyResult).getFirstValue()
+                    ,Optional.ofNullable(contentResult).orElse(emptyResult).getSecondValue());
         } else if (rightMenuCodeList.contains(EnterpriseServiceEnum.POTENTIAL.getRightMenuCode())) {
-            return queryReportDataPotential(enterpriseId, clerkId, storeIds, reportType, bizDate);
+            return Optional.ofNullable(queryReportDataPotential(enterpriseId, clerkId, storeIds, reportType, bizDate)).orElse(emptyResult);
         } else if (rightMenuCodeList.contains(EnterpriseServiceEnum.CONTENT.getRightMenuCode())) {
-            return queryAreaReportDataContent(enterpriseId, clerkId, storeIds, reportType, bizDate);
+            return Optional.ofNullable(queryAreaReportDataContent(enterpriseId, clerkId, storeIds, reportType, bizDate)).orElse(emptyResult);
         }
         return MaterialDataResult.buildEmpty();
     }