Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -1466,6 +1466,9 @@ public class ReportController {
                             if (parentDept != null) {
                                 report.setAuditDeptid(parentDept.getDepartmentId());
                                 report.setAuditDeptManagerid(parentDept.getManagerId());
+                            } else {
+                                //没有上级部门，直接算部门审核通过
+                                report.setDepartmentAuditState(1);
                             }
                         } else {
                             report.setAuditDeptid(department.getDepartmentId());
@@ -1487,6 +1490,9 @@ public class ReportController {
                             if (parentDept != null) {
                                 report.setAuditDeptid(parentDept.getDepartmentId());
                                 report.setAuditDeptManagerid(parentDept.getManagerId());
+                            } else {
+                                //没有上级部门，直接算部门审核通过
+                                report.setDepartmentAuditState(1);
                             }
                         } else {
                             report.setAuditDeptid(department.getDepartmentId());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -971,7 +971,7 @@ public class TimingTask {
                         String deptAuditorId = null;
                         if (report.getDepartmentAuditState() == 0) {
                             deptAuditorId = report.getAuditDeptManagerid();
-                            if (!deptAuditorId.equals(pAuditorId)) {
+                            if (deptAuditorId != null &&!deptAuditorId.equals(pAuditorId)) {
                                 //不是同一个人，需要单独统计
                                 if (auditorMap.get(deptAuditorId) == null) {
                                     auditorMap.put(deptAuditorId, 1L);