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/EmpLaborTroubleController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
index 00aa0e2..8c88d47 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpLaborTroubleController.java
@@ -51,7 +51,6 @@
}
@GetMapping("list")
- @PreAuthorize("hasAuthority('empLabortrouble:list')")
public FebsResponse empLabortroubleList(QueryRequest request, EmpLaborTrouble empLabortrouble) {
Map<String, Object> dataTable = FebsUtil.getDataTable(this.empLabortroubleService.findEmpLabortroubles(request, empLabortrouble));
return new FebsResponse().data(dataTable);
@@ -73,7 +72,7 @@
this.empLabortroubleService.createEmpLabortrouble(empLabortrouble);
} 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 +93,6 @@
}
@DeleteMapping("{ids}")
- @PreAuthorize("hasAuthority('empLabortrouble:delete')")
public void logicDeleteEmpLabortrouble(@PathVariable("ids") String ids) throws FebsException {
try {
this.empLabortroubleService.logicDelEmpLabortrouble(ids);
@@ -112,7 +110,7 @@
this.empLabortroubleService.updateEmpLabortrouble(empLabortrouble);
} 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