From f961867e0e1ca3251928b1134eb66549a6a89ee3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 02 三月 2021 23:45:43 +0800
Subject: [PATCH] Merge branch 'lybfix20210302'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
index 56d7901..c81f57a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpResignServiceImpl.java
@@ -2,6 +2,8 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.exception.FebsException;
+import cc.mrbird.febs.server.hr.constant.MyConstant;
+import cc.mrbird.febs.server.hr.entity.EmpLaborTrouble;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpResign;
import cc.mrbird.febs.server.hr.entity.EmpUnemployment;
@@ -86,9 +88,9 @@
LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
- lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
empResign.setResignId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empResign.setCreator(operatorId);
@@ -102,10 +104,10 @@
LambdaQueryWrapper<EmpResign> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpResign::getEmpId, empResign.getEmpId());
lambdaQueryWrapper.eq(EmpResign::getApplayDate, empResign.getApplayDate());
- lambdaQueryWrapper.eq(EmpResign::getDelFlag,0);
+ lambdaQueryWrapper.ne(EmpResign::getDelFlag,1);
lambdaQueryWrapper.ne(EmpResign::getApplayDate,empResign.getApplayDate());
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
EmpResign dbData = this.getById(empResign.getResignId());
empResign.setCreateTime(dbData.getCreateTime());
--
Gitblit v1.8.0