Merge branch 'master' of git.yfzx.zjtys.com.cn:zjm/notes2.0

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

@@ -449,8 +449,10 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         if(pageRequest.getId()!=null){
             String userId = pageRequest.getId();
             List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByStatusIn(statusList);
+            if(workoverAppros!=null){
                 workoverAppros.forEach(workoverAppro -> {
                     String departmentId = workoverAppro.getDepartmentId();
+                    if(departmentId!=null){
                         String departmentLevel = iUserService.getDepartmentLevel(departmentId);
                         if(("1").equals(departmentLevel)||("2").equals(departmentLevel)){
                             boolean flag = iUserService.findUsersByDepartmentAndAuthority(userId,departmentId);
@@ -458,7 +460,10 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                                 workoverApproList.add(workoverAppro);
                             }
                         }
+                    }
                 });
+            }
+
             strings.add("0");
             List<WorkoverAppro> workoverAppros1 = workoverApproDao.findAllByStatusIn(strings);
             workoverAppros1.forEach(workoverAppro -> {