提交

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

@@ -2448,8 +2448,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             } else {
                 //之前的流程逻辑，综合了一层项目审核，或者一层任务分组审核。 可叠加部门审批流（部门审批时，本部门的负责人是否由上级部门负责人审核，可配置）
+                //取当时提交日报时所在的部门的审批流程来走
                 List<AuditWorkflowTimeSetting> settings = auditWorkflowTimeSettingMapper.selectList(
-                        new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", auditTargetUser.getDepartmentId())
+                        new QueryWrapper<AuditWorkflowTimeSetting>().eq("dept_id", oneReport.getDeptId())
                                 .orderByAsc("seq"));
                 if (settings.size() == 0) {
                     //当前无流程，直接审核通过
@@ -3832,7 +3833,9 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                     for (Integer rid : ids) {
                         String creatorId = allReports.stream().filter(a->a.getId().equals(rid)).findFirst().get().getCreatorId();
                         User auditTargetUser = allUsers.stream().filter(a->a.getId().equals(creatorId)).findFirst().get();
-                        List<AuditWorkflowTimeSetting> deptSettings = settings.stream().filter(s->s.getDeptId().equals(auditTargetUser.getDepartmentId())).collect(Collectors.toList());
+                        //取当时提交日报时所在的部门的审批流程来走
+                        Report reportNode = allReports.stream().filter(a->a.getId().equals(rid)).findFirst().get();
+                        List<AuditWorkflowTimeSetting> deptSettings = settings.stream().filter(s->s.getDeptId().equals(reportNode.getDeptId())).collect(Collectors.toList());
                         Report curReport = new Report().setId(rid);
                         if(timeType.getNeedEvaluate()==1){
                             curReport.setEvaluate(evaluate);