From fb9823428a7705d8ed8e2f4128e525df3781e968 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 03 八月 2021 10:21:09 +0800
Subject: [PATCH] fix(bug修复): 导入的新员工增加了入离职记录；重新处理了导入的日期格式
---
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