fix: 查询没有图片显示bug修复

guzijian
1 parent 5048bce2
Showing 2 changed files with 7 additions and 4 deletions
ruoyi-admin/src/main/java/com/ruoyi/controller/ReportController.java
ruoyi-admin/src/main/java/com/ruoyi/service/ReportService.java
@@ -15,6 +15,9 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.common.SignInEnum.EXPORT;
  
 /**
  * @author 20412
@@ -43,6 +46,10 @@ public class ReportController {
     @PostMapping("/export")
     public void exportReport(@ApiParam ReportViewRequestVo requestVo, HttpServletResponse response) {
         List<ReportViewResponseVo> list = reportService.getReportScrollViewTable(requestVo);
+        // 不导出图片清空路径信息
+        if (!EXPORT.equals(requestVo.getExportFlag())){
+            list = list.stream().map(item->{item.setImage("");return item;}).collect(Collectors.toList());
+        }
         ExcelUtil<ReportViewResponseVo> util = new ExcelUtil<ReportViewResponseVo>(ReportViewResponseVo.class);
         util.exportEasyExcel(response, list, "签到报表");
     }
@@ -40,10 +40,6 @@ public class ReportService {
      */
     public List<ReportViewResponseVo> getReportScrollViewTable(ReportViewRequestVo requestVo) {
         List<ReportViewResponseVo> reportScrollViewTable = signInMapper.getReportScrollViewTable(requestVo);
-        // 不导出图片清空路径信息
-        if (!EXPORT.equals(requestVo.getExportFlag())){
-            reportScrollViewTable = reportScrollViewTable.stream().map(item->{item.setImage("");return item;}).collect(Collectors.toList());
-        }
         return reportScrollViewTable;
     }