From 7e172d1de04d55caafd86489fa81c06c142adab2 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
index 9fb814f..fdd526d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java
@@ -1,12 +1,14 @@
package cc.mrbird.febs.server.hr.service.impl;
import cc.mrbird.febs.common.core.constant.ModuleCode;
+import cc.mrbird.febs.common.core.exception.FebsException;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.hr.entity.Folder;
import cc.mrbird.febs.server.hr.entity.Label;
import cc.mrbird.febs.server.hr.mapper.LabelMapper;
import cc.mrbird.febs.server.hr.service.ILabelService;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -55,7 +57,16 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void createLabel(Label label) {
+ public void createLabel(Label label) throws FebsException {
+ LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper();
+ queryWrapper.eq(Label::getLabelname,label.getLabelname()).or().eq(Label::getLabelcode,label.getLabelcode());
+ Label l = this.getOne(queryWrapper);
+ if(StrUtil.equals(label.getLabelname(),l.getLabelname())){
+ throw new FebsException("标签名字重复");
+ }else if(StrUtil.equals(label.getLabelcode(),l.getLabelcode())){
+ throw new FebsException("标签code重复");
+ }
+
label.setLabelid(SequenceUtil.generateId(0L, ModuleCode.HR_FIlE));
label.setCreator(operatorId);
label.setModifier(operatorId);
@@ -75,7 +86,11 @@
@Transactional(rollbackFor = Exception.class)
public void deleteLabel(Label label) {
LambdaUpdateWrapper<Label> wapper = new LambdaUpdateWrapper<>();
- wapper.eq(Label::getLabelid,label.getLabelid()).setSql("delFlag = 1");
+ wapper.eq(Label::getLabelid,label.getLabelid());
+ Label updateLabel = new Label();
+ updateLabel.setModifier(operatorId);
+ updateLabel.setModifytime(new Date());
+ updateLabel.setDelFlag(1);
this.update(wapper);
}
}
--
Gitblit v1.8.0