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

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

@@ -56,7 +56,7 @@ public class ApprovalController {
                 return ok("删除审批成功");
             }
         } catch (Exception e) {
-            logger.error("删除审批失败");
+            logger.error("删除审批失败，错误内容{}:",e.getMessage());
         }
         return ok("删除审批失败");
     }
@@ -76,7 +76,7 @@ public class ApprovalController {
             ApprovalInformation approvalInformation1 = approvalInformationService.auditApproval(userId,approvalStatus,approvalInformation);
             return ok(approvalInformation1);
         } catch (Exception e) {
-            logger.error("审核审批失败");
+            logger.error("审核审批失败，错误内容{}:",e.getMessage());
         }
         return ok("审核审批失败");
     }
@@ -89,7 +89,7 @@ public class ApprovalController {
             PageResponse<ApprovalInformation> pageResponse = approvalInformationService.findAllApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            logger.error("查找自身提交的审批失败");
+            logger.error("查找自身提交的审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找自身提交的审批失败");
     }
@@ -101,7 +101,7 @@ public class ApprovalController {
             PageResponse<ApprovalInformation> approvalInformations = approvalInformationService.findAllAuditApproval(pageRequest);
             return ok(approvalInformations);
         } catch (Exception e) {
-            logger.error("查找所有我审核的审批失败");
+            logger.error("查找所有我审核的审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找所有我审核的审批失败");
     }
@@ -134,7 +134,7 @@ public class ApprovalController {
             PageResponse<WorkoverAppro> pageResponse = approvalInformationService.findAllSubmitWorkOverApproval(pageRequest);
             return ok(pageResponse);
         } catch (Exception e) {
-            logger.error(e.getMessage()+"查找所有我提交的加班审批失败");
+            logger.error("查找所有我提交的加班审批失败，错误内容{}:",e.getMessage());
         }
         return ok("查找所有我提交的加班审批失败");
     }
@@ -146,7 +146,7 @@ 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("查找所有我审核的加班审批失败");
     }
@@ -158,7 +158,7 @@ public class ApprovalController {
             List<Department> pageResponse = approvalInformationService.findSelectDepartment();
             return ok(pageResponse);
         } catch (Exception e) {
-            logger.error("查找可选择部门失败");
+            logger.error("查找可选择部门失败，错误内容{}:",e.getMessage());
         }
         return ok("查找可选择部门失败");
     }

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

@@ -270,11 +270,17 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         if(pageRequest.getId()!=null){
             String userId = pageRequest.getId();
             approvalInformations.forEach(approvalInformation -> {
-                if(userId.equals(approvalInformation.getApprovalUserIdOne())){
-                    approvalInformationList.add(approvalInformation);
-                }else if(userId.equals(approvalInformation.getApprovalUserIdTwo())){
+                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);
@@ -408,6 +414,11 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         return null;
     }
 
+    /**
+     * 查找所有我审核的加班审批
+     * @param pageRequest
+     * @return
+     */
     @Override
     public PageResponse<WorkoverAppro> findAllAuditWorkOverApproval(PageRequestAtten pageRequest) {
         PageResponse<WorkoverAppro> pageResponse = new PageResponse();
@@ -419,6 +430,16 @@ public class ApprovalInformationServiceImpl implements ApprovalInformationServic
         if(pageRequest.getId()!=null){
             String userId = pageRequest.getId();
             List<WorkoverAppro> workoverAppros = workoverApproDao.findAllByAuditIdAndStatusIn(userId,statusList);
+            workoverAppros.forEach(workoverAppro -> {
+                String departmentId = workoverAppro.getDepartmentId();
+                String departmentLevel = iUserService.getDepartmentLevel(departmentId);
+                if(("1").equals(departmentLevel)||("2").equals(departmentLevel)){
+                    boolean flag = iUserService.findUsersByDepartmentAndAuthority(userId,departmentId);
+                    if(flag){
+                        workoverApproList.add(workoverAppro);
+                    }
+                }
+            });
             strings.add("0");
             List<WorkoverAppro> workoverAppros1 = workoverApproDao.findAllByStatusIn(strings);
             workoverAppros1.forEach(workoverAppro -> {