From b8ede729508288e1ae724fd0c516753808e7c465 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 27 三月 2021 10:07:54 +0800
Subject: [PATCH] fix(bug修复): 除基本信息外，其它信息导入后自动提交
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpBaseInfoServiceImpl.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
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 c32a5db..054d168 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
@@ -175,10 +175,10 @@
String operatorId = Optional.of(FebsUtil.getUserId()).orElse("1");
EmpBaseInfo dbInfo = this.getEmpBaseInfo(empBaseInfo);
Long empId = SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE);
- boolean saveDimissionLog = false;
+ boolean saveDimissionLog = true;
if (dbInfo == null) {
empBaseInfo.setEmpId(empId);
- saveDimissionLog = true;
+ // saveDimissionLog = true;
} else {
empBaseInfo.setEmpId(dbInfo.getEmpId());
}
@@ -193,18 +193,16 @@
empBaseInfo.setModifier(operatorId);
this.saveOrUpdate(empBaseInfo);
- if(saveDimissionLog) {
- EmpDimissionLog dimissionLog = new EmpDimissionLog();
- dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
- dimissionLog.setEmpId(empId);
- dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
- dimissionLog.setDimissionType("20");
- dimissionLog.setRemark(empBaseInfo.getRemark());
- dimissionLog.setCreator(operatorId);
- dimissionLog.setModifier(operatorId);
+ EmpDimissionLog dimissionLog = new EmpDimissionLog();
+ dimissionLog.setCloseId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
+ dimissionLog.setEmpId(empId);
+ dimissionLog.setEntryDate(empBaseInfo.getEntryDate());
+ dimissionLog.setDimissionType("20");
+ dimissionLog.setRemark(empBaseInfo.getRemark());
+ dimissionLog.setCreator(operatorId);
+ dimissionLog.setModifier(operatorId);
- dimissionLogService.save(dimissionLog);
- }
+ dimissionLogService.save(dimissionLog);
}
@Override
--
Gitblit v1.8.0