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/EmpOccupationalController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
index d73ef1a..1f54af0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpOccupationalController.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.server.hr.controller;
import cc.mrbird.febs.server.hr.annotation.ControllerEndpoint;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
import cc.mrbird.febs.server.hr.entity.EmpLeaveInfo;
import cc.mrbird.febs.server.hr.entity.EmpOccupational;
import cc.mrbird.febs.server.hr.service.IEmpOccupationalService;
@@ -8,6 +9,7 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
+import cn.hutool.core.util.StrUtil;
import com.wuwenze.poi.ExcelKit;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -69,6 +71,9 @@
this.empOccupationalService.createEmpOccupational(empOccupational);
} catch (Exception e) {
String message = "新增员工工伤案件失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
log.error(message, e);
throw new FebsException(message);
}
@@ -87,7 +92,6 @@
}
@DeleteMapping("{ids}")
- @PreAuthorize("hasAuthority('empOccupational:delete')")
public void logicDeleteEmpOccupational(@PathVariable("ids") String ids) throws FebsException {
try {
this.empOccupationalService.logicDelEmpOccupational(ids);
--
Gitblit v1.8.0