From 85634b7f43eac1920281cd927325e0be985f1aa8 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 02 四月 2021 01:04:10 +0800
Subject: [PATCH] fix(bug修复): 在职员工授权与人员入司工龄计算
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 1 +
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 2 +-
3 files changed, 3 insertions(+), 2 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 558cb45..e171a97 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
@@ -126,6 +126,7 @@
@ApiOperation(value = "人员基本信息逻辑删除")
@DeleteMapping("{ids}")
+ @PreAuthorize("hasAuthority('empBaseinfo:delete')")
public void logicDeleteEmpBaseInfo(@NotBlank(message = "{required}") @PathVariable("ids") String ids) throws FebsException {
try {
this.empBaseInfoService.logicDelEmpBaseInfo(ids);
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 44be67a..e2f9cad 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -188,7 +188,7 @@
@FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
@TableField("seniority")
@ExcelField(value = "入司工龄")
- private Integer seniority = 0;
+ private String seniority = "0年0月";
@FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
@TableField("nativePlace")
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
index 9a93c34..4204352 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java
@@ -545,7 +545,7 @@
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empBaseInfo.setSeniority(Integer.valueOf(list.get(13).toString()));
+ empBaseInfo.setSeniority(list.get(13).toString());
}
//籍贯
--
Gitblit v1.8.0