合并分支 'gwj' 到 'master'

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

@@ -288,19 +288,6 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         List<ApprovalInformation> approvalInformationList = new ArrayList<>();
         if(pageRequest.getId()!=null){
             String userId = pageRequest.getId();
-            approvalInformations.forEach(approvalInformation -> {
-                String departmentId = approvalInformation.getDepartmentId();
-                boolean flag = iUserService.findUsersByDepartmentAndAuthority(userId,departmentId);
-                if(flag){
-                    approvalInformationList.add(approvalInformation);
-                }
-
-//                if(userId.equals(approvalInformation.getApprovalUserIdOne())){
-//                    approvalInformationList.add(approvalInformation);
-//                }else if(userId.equals(approvalInformation.getApprovalUserIdTwo())){
-//                    approvalInformationList.add(approvalInformation);
-//                }
-            });
             strings.add("0");
             List<ApprovalInformation> approvalInformationList1 = approvalInformationDao.findAllByStatusIn(strings);
             approvalInformationList1.forEach(approvalInformation -> {
@@ -331,6 +318,21 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                 }
 
             });
+
+            approvalInformations.forEach(approvalInformation -> {
+                String departmentId = approvalInformation.getDepartmentId();
+                boolean flag = iUserService.findUsersByDepartmentAndAuthority(userId,departmentId);
+                if(flag){
+                    approvalInformationList.add(approvalInformation);
+                }
+
+//                if(userId.equals(approvalInformation.getApprovalUserIdOne())){
+//                    approvalInformationList.add(approvalInformation);
+//                }else if(userId.equals(approvalInformation.getApprovalUserIdTwo())){
+//                    approvalInformationList.add(approvalInformation);
+//                }
+            });
+
         }
 
         if(approvalInformationList!=null){
@@ -448,8 +450,10 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         List<WorkoverAppro> workoverApproList = new ArrayList<>();
         if(pageRequest.getId()!=null){
             String userId = pageRequest.getId();
-            List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByStatusIn(statusList);
-            workoverAppros.forEach(workoverAppro -> {
+            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)){
@@ -458,12 +462,14 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                             workoverApproList.add(workoverAppro);
                         }
                     }
+                }
             });
-            strings.add("0");
-            List<WorkoverAppro> workoverAppros1 = workoverApproDao.findAllByStatusIn(strings);
-            workoverAppros1.forEach(workoverAppro -> {
-                if(workoverAppro.getDepartmentId()!=null){
+
+            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);
@@ -473,6 +479,7 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
                         }
                     }
                 });
+            }
             workoverApproList.addAll(workoverAppros);
         }
         if(workoverApproList!=null){