20250910-理解技术交底书生成结果

src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -1028,7 +1028,7 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
 
     //装载查询语句
     private List<String> loadSearchSql(List<String> sqls) {
-        PersonnelVO personnelVO = cacheUtils.getLoginUser(1);
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         String id = personnelVO.getId();
         Integer tenantId = personnelVO.getTenantId();
         Integer roleType = personnelVO.getRoleType();

src/main/java/cn/cslg/pas/service/report/ExportReportListService.java

@@ -90,7 +90,7 @@ public class ExportReportListService {
     public void loadAffair(ExportInvalidReportVO exportInvalidReportVO, ReportProjectVO reportProjectVO, List<ReportAffairVO> reportAffairVOS) {
         List<ReportAffairVO> reportAffairVOList = reportAffairVOS.stream().filter(item -> item.getProjectId().equals(reportProjectVO.getId())).collect(Collectors.toList());
         ReportAffairVO reportAffairNotification = reportAffairVOList.stream().filter(item -> item.getFlowType() != null && item.getFlowType().equals(29)).findFirst().orElse(null);
-        List<ReportAffairVO> reportAffairZhuanWen = reportAffairVOList.stream().filter(item -> item.getFlowType() != null && item.getFlowType().equals(30)).sorted(Comparator.comparing(ReportAffairVO::getOccurredTime)).collect(Collectors.toList());
+        List<ReportAffairVO> reportAffairZhuanWen = reportAffairVOList.stream().filter(item -> item.getFlowType() != null && item.getFlowType().equals(30)&&item.getOccurredTime()!=null).sorted(Comparator.comparing(ReportAffairVO::getOccurredTime)).collect(Collectors.toList());
         ReportAffairVO invalidDecision = reportAffairVOList.stream().filter(item -> item.getFlowType() != null && item.getFlowType().equals(7)).findFirst().orElse(null);
         for (ReportAffairVO reportAffairVO : reportAffairZhuanWen) {
             if (exportInvalidReportVO.getZhuanwen1Date() == null) {