From d7b6f020d3b6cce69f19f5198da95513c5d57b32 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 23 九月 2025 21:53:14 +0800
Subject: [PATCH] 1.系统管理中系统参数增加了将配置项写入缓存的功能 2.系统管理启动时将配置项写入缓存 3.员工基本信息增加了年假字段 4.员工基本信息服务增加了计算年假的功能

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.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/EmpBadRecordController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
index 4568636..7f9d237 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBadRecordController.java
@@ -74,7 +74,7 @@
             this.empBadrecordService.createEmpBadrecord(empBadrecord);
         } 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);
@@ -95,7 +95,6 @@
     }
 
     @DeleteMapping("{ids}")
-    @PreAuthorize("hasAuthority('empBadrecord:delete')")
     public void logicDeleteEmpBadrecord(@PathVariable("ids") String ids) throws FebsException {
         try {
             this.empBadrecordService.logicDelEmpBadrecord(ids);
@@ -113,7 +112,7 @@
             this.empBadrecordService.updateEmpBadrecord(empBadrecord);
         } 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