合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/service/impl/ApprovalInformationServiceImpl.java

@@ -443,6 +443,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
             strings.add("0");
             List<WorkoverAppro> workoverAppros1 = workoverApproDao.findAllByStatusIn(strings);
             workoverAppros1.forEach(workoverAppro -> {
+                if(workoverAppro.getDepartmentId()!=null){
                     String departmentId = workoverAppro.getDepartmentId();
                     String departmentLevel = iUserService.getDepartmentLevel(departmentId);
                     if(("1").equals(departmentLevel)||("2").equals(departmentLevel)){
@@ -451,6 +452,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                             workoverApproList.add(workoverAppro);
                         }
                     }
+                }
             });
             workoverApproList.addAll(workoverAppros);
         }