From 14a1d7b4f7da211a333f997d8ec5a31bfeb82f2c Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期二, 30 三月 2021 12:18:14 +0800
Subject: [PATCH] fix(hr微服务): 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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 fdd526d..cf32aa5 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
@@ -4,6 +4,7 @@
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.EmpAccessory;
import cc.mrbird.febs.server.hr.entity.Folder;
import cc.mrbird.febs.server.hr.entity.Label;
import cc.mrbird.febs.server.hr.mapper.LabelMapper;
@@ -40,6 +41,7 @@
private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
.map(u -> u.getUserId().toString())
.orElse("1");
+
@Override
public IPage<Label> findLabels(QueryRequest request, Label label) {
LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper<>();
@@ -51,19 +53,22 @@
@Override
public List<Label> findLabels(Label label) {
LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.select(Label::getLabelcode,Label::getLabelname,Label::getLabelid).eq(Label::getDelFlag,0);
- return this.baseMapper.selectList(queryWrapper);
+ if (StrUtil.isNotBlank(label.getLabelcode())){
+ queryWrapper.select(Label::getLabelcode, Label::getLabelcode, Label::getLabelid);
+ }
+ queryWrapper.eq(Label::getDelFlag, 0).orderByAsc(Label::getSort);
+ return this.list(queryWrapper);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void createLabel(Label label) throws FebsException {
LambdaQueryWrapper<Label> queryWrapper = new LambdaQueryWrapper();
- queryWrapper.eq(Label::getLabelname,label.getLabelname()).or().eq(Label::getLabelcode,label.getLabelcode());
+ queryWrapper.eq(Label::getDelFlag,0).and(i->i.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())){
+ if (null != l && StrUtil.equals(label.getLabelname(), l.getLabelname())) {
+ throw new FebsException("标签名字重复");
+ } else if (null != l && StrUtil.equals(label.getLabelcode(), l.getLabelcode())) {
throw new FebsException("标签code重复");
}
@@ -86,11 +91,11 @@
@Transactional(rollbackFor = Exception.class)
public void deleteLabel(Label label) {
LambdaUpdateWrapper<Label> wapper = new LambdaUpdateWrapper<>();
- wapper.eq(Label::getLabelid,label.getLabelid());
- Label updateLabel = new Label();
- updateLabel.setModifier(operatorId);
- updateLabel.setModifytime(new Date());
- updateLabel.setDelFlag(1);
+ wapper.eq(Label::getLabelid, label.getLabelid());
+ wapper.set(Label::getDelFlag,1);
+ wapper.set(Label::getModifier,operatorId);
+ wapper.set(Label::getModifytime,new Date());
this.update(wapper);
}
+
}
--
Gitblit v1.8.0