From 4fe77f83783b35d9e541d6dd56d95b40f0af0670 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 18 三月 2021 07:19:41 +0800
Subject: [PATCH] fix(bug修复): 重新打开档案时，将原离职日期设置成1900-01-01，以便前端不再显示
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
index 24c6b3e..7fe2c93 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpInsuranceController.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.EmpDimissionLog;
import cc.mrbird.febs.server.hr.entity.EmpInsurance;
import cc.mrbird.febs.server.hr.service.IEmpInsuranceService;
@@ -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;
@@ -71,6 +73,9 @@
this.empInsuranceService.createEmpInsurance(empInsurance);
} catch (Exception e) {
String message = "新增员工社保申请失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
log.error(message, e);
throw new FebsException(message);
}
@@ -107,6 +112,9 @@
this.empInsuranceService.updateEmpInsurance(empInsurance);
} catch (Exception e) {
String message = "修改员工社保申请失败";
+ if (StrUtil.equals(e.getMessage(), MyConstant.MESSAGE)){
+ message = e.getMessage();
+ }
log.error(message, e);
throw new FebsException(message);
}
--
Gitblit v1.8.0