From 70ffa97635e61caa108d3a5262c9a6d86a3eb4c5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 七月 2025 11:10:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
index 00d2131..b0570e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ReportController.java
@@ -24,6 +24,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.models.auth.In;
import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -384,6 +385,9 @@
}
List<ProjectDeptDetailsVO> res = new ArrayList<>();
List<TTask> tasks = taskCleanerService.list(tTaskLambdaQueryWrapper);
+ if(CollectionUtils.isEmpty(tasks)){
+ return R.ok(res);
+ }
List<TTaskDetail> taskDetails = taskDetailService.lambdaQuery().orderByDesc(BaseModel::getCreateTime).list();
List<String> collect = tasks.stream().map(TTask::getProjectId).distinct().collect(Collectors.toList());
List<TProjectDept> projectDepts = projectDeptService.list();
--
Gitblit v1.7.1