From 65dd37fa28891be5aeb60535e3f09639abbaea79 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 15 三月 2021 12:17:18 +0800
Subject: [PATCH] fix(bug修复): 员工附属信息级联删除
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/LabelServiceImpl.java | 7 +++++--
1 files changed, 5 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 a06ba80..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,8 +53,11 @@
@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
--
Gitblit v1.8.0