检验审核人

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

@@ -2367,6 +2367,11 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                 upR.setEvaluate(evaluate);
                             }
                             Integer auditDeptid = item.getAuditDeptid();
+                            //校验当前操作人是否是该节点的审核人
+                            if (!user.getId().equals(item.getAuditDeptManagerid())) {
+                                httpRespMsg.setError("您无权审核该日报");
+                                return httpRespMsg;
+                            }
                             for (int m=0;m<settings.size(); m++) {
                                 if (auditDeptid.equals(settings.get(m).getAuditDeptId()) && m < settings.size() -1) {
                                     AuditWorkflowTimeSetting nextNode = settings.get(m + 1);
@@ -2434,16 +2439,12 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                                                         //没有上级部门，直接取当前部门的负责人
                                                         upR.setAuditDeptManagerid(curDeptManagerId);
                                                     } else {
-//                                                        upR.setAuditDeptid(parentDeptId);
                                                         upR.setAuditDeptManagerid(allDepts.stream()
                                                                 .filter(ad->ad.getDepartmentId().equals(parentDeptId)).findFirst().get().getManagerId());
                                                     }
                                                 } else {
                                                     upR.setAuditDeptManagerid(curDeptManagerId);
                                                 }
-
-//                                                upR.setAuditDeptManagerid(allDepts.stream()
-//                                                        .filter(ad->ad.getDepartmentId().equals(nextNode.getAuditDeptId())).findFirst().get().getManagerId());
                                             }
                                             upR.setIsFinalAudit(nextNode.getIsFinal());
                                             break;

fhKeeper/formulahousekeeper/timesheet_h5/src/views/edit/index.vue

@@ -1537,9 +1537,7 @@ export default {
                                 subProjectName = list[i].subProjectList.filter(s => s.id == list[i].subProjectId)[0].name;
                             }
                             var projectName = list[i].projectName;
-                            console.log('in for loop=='+projectName)
                             arr.push({
-                                id: list[i].id,
                                 projectId: list[i].projectId,
                                 projectName: projectName,
                                 workingTime: String(list[i].workingTime),