Pārlūkot izejas kodu

Revert "11"

This reverts commit adefce354dfd514f6fd634f3313b6f0c23f60b4e.
seyason 1 gadu atpakaļ
vecāks
revīzija
779517543b

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

@@ -1812,7 +1812,6 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             //第二步,日报审核人审核
                             if (r.getProjectAuditState() == null || r.getProjectAuditState() == 0) {
                                 if (hasAuditAllPri || user.getId().equals(r.getProjectAuditorId())) {
-                                    System.out.println("TEST333");
                                     newReport.setState(1);
                                     newReport.setProjectAuditState(1);
                                     newReport.setProjectAuditTime(LocalDateTime.now());
@@ -2920,7 +2919,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                         } else {
                             //第二步,日报审核人审核
                             if (r.getProjectAuditState() == null || r.getProjectAuditState() == 0) {
-                                if (user.getId().equals(r.getProjectAuditorId())) {
+                                if (hasAuditAllPri || user.getId().equals(r.getProjectAuditorId())) {
                                     newReport.setState(1);
                                     newReport.setProjectAuditState(1);
                                     newReport.setProjectAuditTime(LocalDateTime.now());