按周填报项目只显示进行中的

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -9088,13 +9088,13 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         //加载这段时间内已填报过的项目
         List<Project> projectList = new ArrayList<>();
         if (collect.size() > 0) {
-            projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect));
+            projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", collect).eq("status", 1));
 			auditorList = userMapper.selectList(new QueryWrapper<User>().in("id", reportList.stream().map(Report::getProjectAuditorId).collect(Collectors.toList())));
         } else {
             //没有项目，默认加载最近填报过的项目
             List<Report> oldReport = reportMapper.selectList(new QueryWrapper<Report>().select("distinct project_id").eq("creator_id", userId).orderByDesc("id").last("limit 5"));
             if (oldReport.size() > 0) {
-                projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", oldReport.stream().map(Report::getProjectId).collect(Collectors.toList())));
+                projectList = projectMapper.selectList(new QueryWrapper<Project>().in("id", oldReport.stream().map(Report::getProjectId).collect(Collectors.toList())).eq("status", 1));
             }
         }
         if (projectList.size() > 0 && !sysFunctionService.hasPriviledge(user.getRoleId(), "可填报全部项目")) {