From c12ca804e93a7f62b006dca60fa3d8797e0480d8 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期一, 15 三月 2021 00:33:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicServiceImpl.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicServiceImpl.java
index dc991c8..595ac10 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicServiceImpl.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/service/impl/DicServiceImpl.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.common.core.constant.ModuleCode;
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.system.Dic;
+import cc.mrbird.febs.common.core.entity.system.Position;
import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.common.core.utils.SequenceUtil;
import cc.mrbird.febs.server.system.mapper.DicMapper;
@@ -12,6 +13,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
@@ -41,6 +43,9 @@
public IPage<Dic> findDics(QueryRequest request, Dic dic) {
LambdaQueryWrapper<Dic> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(Dic::getDelFlag, 0);
+ if(StringUtils.isNotBlank(dic.getDicName())){
+ queryWrapper.like(Dic::getDicName, dic.getDicName());
+ }
Page<Dic> page = new Page<>(request.getPageNum(), request.getPageSize());
return this.page(page, queryWrapper);
}
@@ -78,6 +83,7 @@
public void deleteDic(Dic dic) {
LambdaQueryWrapper<Dic> wrapper = new LambdaQueryWrapper<>();
// TODO 设置删除条件
+ wrapper.eq(Dic::getDicId, dic.getDicId());
this.remove(wrapper);
}
@@ -95,6 +101,11 @@
public void logicDelDic(String ids) {
String[] str = ids.split(",");
List<String> list = new ArrayList<>(Arrays.asList(str));
- dicMapper.logicDeleteByIds(list, operatorId);
+ for (String str1:list){
+ LambdaQueryWrapper<Dic> wrapper = new LambdaQueryWrapper<>();
+// TODO 设置删除条件
+ wrapper.eq(Dic::getDicId, str1);
+ this.remove(wrapper);
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0