From 07445c629b9f92505f2132e00423e5622e92e2d9 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 13 三月 2021 18:59:39 +0800
Subject: [PATCH] xx
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 eeef584..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
@@ -53,15 +53,18 @@
@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 (null != l && StrUtil.equals(label.getLabelname(), l.getLabelname())) {
throw new FebsException("标签名字重复");
@@ -94,4 +97,5 @@
wapper.set(Label::getModifytime,new Date());
this.update(wapper);
}
+
}
--
Gitblit v1.8.0