From 15e30e0207156758d8b714a1ad00232aac7b8cf0 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期二, 02 三月 2021 01:04:51 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
index ad03065..14b2364 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpUnemploymentServiceImpl.java
@@ -7,6 +7,7 @@
import java.util.Optional;
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 org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
@@ -89,10 +90,10 @@
public void createEmpUnemployment(EmpUnemployment empUnemployment) throws FebsException {
LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
- lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
- lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
+ lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate() );
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
empUnemployment.setUnemploymentId(SequenceUtil.generateId(0L, ModuleCode.HR_EMPLOYEE));
empUnemployment.setCreator(operatorId);
@@ -106,10 +107,10 @@
LambdaQueryWrapper<EmpUnemployment> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(EmpUnemployment::getEmpId, empUnemployment.getEmpId());
lambdaQueryWrapper.eq(EmpUnemployment::getApplayDate, empUnemployment.getApplayDate());
- lambdaQueryWrapper.eq(EmpUnemployment::getDelFlag,0);
- lambdaQueryWrapper.ne(EmpUnemployment::getApplayDate,empUnemployment.getApplayDate());
+ lambdaQueryWrapper.ne(EmpUnemployment::getDelFlag,1);
+ lambdaQueryWrapper.ne(EmpUnemployment::getUnemploymentId,empUnemployment.getUnemploymentId());
if (this.count(lambdaQueryWrapper) > 0) {
- throw new FebsException("当日记录已存在");
+ throw new FebsException(MyConstant.MESSAGE);
}
EmpUnemployment dbData = this.getById(empUnemployment.getUnemploymentId());
empUnemployment.setCreateTime(dbData.getCreateTime());
--
Gitblit v1.8.0