From d89118c8c2f83e4d39f05b774e9019141f0a6341 Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期三, 24 九月 2025 09:35:11 +0800
Subject: [PATCH] fix: 修复数据库表名大小写不一致问题及SQL查询错误
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.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/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index a5a6390..eb19d36 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -103,6 +104,7 @@
throw new FebsException("已存在此身份证号:" + empBaseinfo.getCertificateNumb());
}
try {
+ empBaseinfo.setEntryType("20");
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
String message = "新增员工基本信息失败";
@@ -223,7 +225,7 @@
empPhysicalExamService.importEmpPhysicalExam(listObject.get(2),returnList,dicItems);
empContractInfoService.importEmpContractInfo(listObject.get(3),returnList,dicItems);
empDimissionAttendService.importEmpDimissionAttend(listObject.get(4),returnList);
- empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList);
+ empLeaveInfoService.importEmpLeaveInfo(listObject.get(5),returnList,dicItems);
empResignService.importEmpResign(listObject.get(6),returnList);
empUnemploymentService.importEmpUnemployment(listObject.get(7),returnList);
empInsuranceService.importEmpInsurance(listObject.get(8),returnList,dicItems);
@@ -243,6 +245,7 @@
@ApiOperation(value = "关闭员工档案")
@PostMapping("dimission")
+ @PreAuthorize("hasAuthority('empBaseinfo:dimission')")
public void dimissionEmp(EmpDimissionLog empDimissionLog) throws FebsException {
try {
this.empBaseInfoService.closeEmpArchives(empDimissionLog);
@@ -254,6 +257,7 @@
}
@ApiOperation(value = "员工岗位变更")
@PostMapping("jobChange")
+ @PreAuthorize("hasAuthority('empBaseinfo:jobChange')")
public void changeEmpJob(EmpJobChange empJobChange) throws FebsException {
try {
this.empBaseInfoService.changeEmpJob(empJobChange);
--
Gitblit v1.8.0