渠道发佣报表16

yd-api/src/main/java/com/yd/api/agms/service/impl/AgmsFortuneServiceImpl.java

@@ -1000,7 +1000,10 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
         List<CommissionPayoutStatus> commissionPayoutStatusList = agmsFortuneDalService.commissionPayoutStatusQuery(info);
         List<Long> fortuneIdList = new ArrayList<>();
         commissionPayoutStatusList.forEach(i -> fortuneIdList.add(i.getFortuneId()));
-        List<Map<String, Object>> dataList = agmsFortuneDalService.querySheet3Data(fortuneIdList);
+        List<Map<String, Object>> dataList = null;
+        if (fortuneIdList.size() > 0) {
+            dataList = agmsFortuneDalService.querySheet3Data(fortuneIdList);
+        }
 
         // 3.填充数据
         generateSheet(sheet3, columnName, dataList);
@@ -1050,7 +1053,10 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
                 "D01-首年渠道服务费", "D02-续年渠道服务费", "D91-渠道加扣款1", "D92-渠道加扣款2"};
         // 2.1 查询Sheet2数据
         List<Map<String, Object>> dataList = agmsFortuneDalService.querySheet2Data(fortuneIdList, fortuneIdList2);
-
+        // 2.2 将结果集中的推荐人、体系等id替换为中文
+        if (CollectionUtils.isNotEmpty(dataList)) {
+            exportSalaryDetailsSheet2queryOrganization(dataList);
+        }
         // 3.填充数据
         generateSheet(sheet2, columnName, dataList);
     }
@@ -1061,11 +1067,7 @@ public class AgmsFortuneServiceImpl implements AgmsFortuneService {
         for (int j = 0; j < columnName.length; j++) {
             rownum.createCell(j).setCellValue(columnName[j]);
         }
-        // 2.将结果集中的推荐人、体系等id替换为中文
-        if (CollectionUtils.isNotEmpty(dataList)) {
-            exportSalaryDetailsSheet2queryOrganization(dataList);
-        }
-        // 3.遍历数据，产生数据行
+        // 2.遍历数据，产生数据行
         if (null != dataList) {
             for (int i = 0; i < dataList.size(); i++) {
                 Map<String, Object> values = dataList.get(i);