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