From 06fac01c188df139de9209763044df2d8b3492c5 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期一, 05 六月 2023 20:14:21 +0800
Subject: [PATCH] 456
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
index 4525007..3badb7a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEconomyServiceImpl.java
@@ -23,6 +23,8 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -49,8 +51,8 @@
private LambdaQueryWrapper<ZfEconomy> buildCondition(ZfEconomy zfEconomy) {
LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
- lqw.eq(zfEconomy.getType()!=null,ZfEconomy::getType,zfEconomy.getType());
- lqw.eq(zfEconomy.getKind()!=null,ZfEconomy::getKind,zfEconomy.getKind());
+ lqw.like(StringUtils.isNotEmpty(zfEconomy.getType()),ZfEconomy::getType,zfEconomy.getType());
+ lqw.like(StringUtils.isNotEmpty(zfEconomy.getKind()),ZfEconomy::getKind,zfEconomy.getKind());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getPrice()),ZfEconomy::getPrice,zfEconomy.getPrice());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getUseFor()),ZfEconomy::getUseFor,zfEconomy.getUseFor());
lqw.like(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
@@ -63,8 +65,8 @@
private LambdaQueryWrapper<ZfEconomy> uniqueCondition(ZfEconomy zfEconomy) {
LambdaQueryWrapper<ZfEconomy> lqw = new LambdaQueryWrapper<>();
- lqw.eq(zfEconomy.getType()!=null,ZfEconomy::getType,zfEconomy.getType());
- lqw.eq(zfEconomy.getKind()!=null,ZfEconomy::getKind,zfEconomy.getKind());
+ lqw.eq(StringUtils.isNotEmpty(zfEconomy.getType()),ZfEconomy::getType,zfEconomy.getType());
+ lqw.eq(StringUtils.isNotEmpty(zfEconomy.getKind()),ZfEconomy::getKind,zfEconomy.getKind());
lqw.eq(StringUtils.isNotEmpty(zfEconomy.getPrice()),ZfEconomy::getPrice,zfEconomy.getPrice());
lqw.eq(StringUtils.isNotEmpty(zfEconomy.getUseFor()),ZfEconomy::getUseFor,zfEconomy.getUseFor());
lqw.eq(StringUtils.isNotEmpty(zfEconomy.getUsePeople()),ZfEconomy::getUsePeople,zfEconomy.getUsePeople());
@@ -205,6 +207,16 @@
return markOwnData(familyIds, beanRecords);
}
+ @Override
+ public List<ZfEconomy> selectByIds(Long[] ids) {
+ List<ZfEconomy> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private List<ZfEconomy> markOwnData(String familyIds, List<ZfEconomy> beanRecords) {
return beanRecords.stream().peek(record -> {
String recordFamilyId = record.getFamilyId();
@@ -277,8 +289,6 @@
}
-
-
@Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
@@ -299,4 +309,5 @@
}
+
}
--
Gitblit v1.9.1