合并分支 'gwj' 到 'master'

notes-attendance/src/main/java/com/zjty/tynotes/attendance/controller/ApprovalController.java

@@ -101,9 +101,9 @@ public class ApprovalController {
             PageResponse<ApprovalInformation> approvalInformations = approvalInformationService.findAllAuditApproval(pageRequest);
             return ok(approvalInformations);
         } catch (Exception e) {
-            logger.error("查找所有我审核的审批");
+            logger.error("查找所有我审核的审批失败");
         }
-        return ok("查找所有我审核的审批");
+        return ok("查找所有我审核的审批失败");
     }
 
     @ApiOperation(value = "提交加班申请", response = WorkoverAppro.class)
@@ -146,9 +146,9 @@ public class ApprovalController {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllAuditWorkOverApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            logger.error(e.getMessage()+"查找所有我审核的审批");
+            logger.error(e.getMessage()+"查找所有我审核的加班审批");
         }
-        return ok("查找所有我审核的审批");
+        return ok("查找所有我审核的加班审批失败");
     }
 
     @ApiOperation(value = "申请单的选择部门")
@@ -158,9 +158,9 @@ public class ApprovalController {
             List<Department> pageResponse = approvalInformationService.findSelectDepartment();
             return ok(pageResponse);
         } catch (Exception e) {
-            logger.error("查找所有我审核的审批");
+            logger.error("查找可选择部门失败");
         }
-        return ok("查找所有我审核的审批");
+        return ok("查找可选择部门失败");
     }
 
 

notes-attendance/src/main/java/com/zjty/tynotes/attendance/dao/WorkoverApproDao.java

@@ -17,7 +17,7 @@ public interface WorkoverApproDao extends MongoRepository<WorkoverAppro,String>
 
     List<WorkoverAppro> findAllByUserId(String userId);
 
-    List<WorkoverAppro> findAllByAuditIdAndStatusIn(List<String> userIds);
+    List<WorkoverAppro> findAllByAuditIdAndStatusIn(String auditId,List<String> userIds);
 
     List<WorkoverAppro> findAllByStatusIn(List<String> userIds);
 

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

@@ -265,8 +265,6 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         statusList.add("1");
         statusList.add("2");
 
-//        List<ApprovalInformation> approvalInformations1 = approvalInformationDao.findAll();
-
         List<ApprovalInformation> approvalInformations = approvalInformationDao.findAllByStatusIn(statusList);
         List<ApprovalInformation> approvalInformationList = new ArrayList<>();
         if(pageRequest.getId()!=null){
@@ -417,10 +415,10 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         List<String> strings = new ArrayList<>();
         statusList.add("1");
         statusList.add("2");
-        List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByAuditIdAndStatusIn(statusList);
         List<WorkoverAppro> workoverApproList = new ArrayList<>();
         if(pageRequest.getId()!=null){
             String userId = pageRequest.getId();
+            List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByAuditIdAndStatusIn(userId,statusList);
             strings.add("0");
             List<WorkoverAppro> workoverAppros1 = workoverApproDao.findAllByStatusIn(strings);
             workoverAppros1.forEach(workoverAppro -> {