From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
index 23c90ab..f96f87c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpResignController.java
@@ -73,7 +73,7 @@
             this.empResignService.createEmpResign(empResign);
         } catch (Exception e) {
             String message = "新增员工辞职申请失败";
-            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+            if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                 message = e.getMessage();
             }
             log.error(message, e);
@@ -94,7 +94,6 @@
     }
 
     @DeleteMapping("{ids}")
-    @PreAuthorize("hasAuthority('empResign:delete')")
     public void logicDeleteEmpResign(@PathVariable("ids") String ids) throws FebsException {
         try {
             this.empResignService.logicDelEmpResign(ids);
@@ -112,7 +111,7 @@
             this.empResignService.updateEmpResign(empResign);
         } catch (Exception e) {
             String message = "修改员工辞职申请失败";
-            if (!StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+            if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
                 message = e.getMessage();
             }
             log.error(message, e);

--
Gitblit v1.8.0