From 1836f7863882ceae0e5c246556196be48bd12384 Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 08 四月 2023 00:13:27 +0800
Subject: [PATCH] 111
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index a6d3abf..bcd6416 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -28,6 +28,7 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
@@ -42,58 +43,57 @@
@Resource
ZInfoUserService zInfoUserService;
-
+
@Resource
IZfPropertyService zfPropertyService;
@Override
public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
String familyIds = listFamilyIds();
- LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty,familyIds);
+ LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty, familyIds);
List<ZfProperty> list = list(lambdaQueryWrapper);
- log.info("杩斿洖鐨勬暟鎹负:{}",list);
+ log.info("杩斿洖鐨勬暟鎹负:{}", list);
return list;
}
private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
- lqw.like(!StringUtils.isEmpty(zfProperty.getType()),ZfProperty::getType, zfProperty.getType());
- lqw.like(!StringUtils.isEmpty(zfProperty.getTitle()),ZfProperty::getTitle, zfProperty.getTitle());
- lqw.like(!StringUtils.isEmpty(zfProperty.getLocation()),ZfProperty::getLocation, zfProperty.getLocation());
- lqw.like(!StringUtils.isEmpty(zfProperty.getHolder()),ZfProperty::getHolder, zfProperty.getHolder());
- lqw.like(!StringUtils.isEmpty(zfProperty.getAddress()),ZfProperty::getAddress, zfProperty.getAddress());
- lqw.like(!StringUtils.isEmpty(zfProperty.getRemark()),ZfProperty::getRemark, zfProperty.getRemark());
- lqw.like(zfProperty.getCreateTime()!=null,ZfProperty::getCreateTime, zfProperty.getCreateTime());
+
+ lqw.like(!StringUtils.isEmpty(zfProperty.getType()), ZfProperty::getType, zfProperty.getType())
+ .like(!StringUtils.isEmpty(zfProperty.getTitle()), ZfProperty::getTitle, zfProperty.getTitle())
+ .like(!StringUtils.isEmpty(zfProperty.getLocation()), ZfProperty::getLocation, zfProperty.getLocation())
+ .like(!StringUtils.isEmpty(zfProperty.getHolder()), ZfProperty::getHolder, zfProperty.getHolder())
+ .like(!StringUtils.isEmpty(zfProperty.getAddress()), ZfProperty::getAddress, zfProperty.getAddress())
+ .like(!StringUtils.isEmpty(zfProperty.getRemark()), ZfProperty::getRemark, zfProperty.getRemark())
+ .like(zfProperty.getCreateTime() != null, ZfProperty::getCreateTime, zfProperty.getCreateTime());
return lqw;
}
- private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty,String familyIds) {
+ private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty, String familyIds) {
LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
if (familyIds.contains(",")) {
String[] familyList = familyIds.split(",");
- for (String familyId : familyList) {
- lqw.or().eq(ZfProperty::getFamilyId,familyId);
- }
- }else {
- lqw.eq(ZfProperty::getFamilyId,familyIds);
+ lqw.in(ZfProperty::getFamilyId,familyList);
+ } else {
+ lqw.eq(ZfProperty::getFamilyId, familyIds);
}
return lqw;
}
- private String listFamilyIds(){
+ private String listFamilyIds() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
- zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId,userId);
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId, userId);
ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
return zInfoUser.getFamilyId();
}
@Override
- public AjaxResult selectPropertyList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
+ public AjaxResult selectPropertyList(ZfProperty zfProperty, Integer pageNum, Integer pageSize) {
String familyIds = listFamilyIds();
- LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty,familyIds);
- Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
+ LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, familyIds);
+ Page<ZfProperty> zfPropertyPage = new Page<>(pageNum, pageSize);
Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
HashMap<String, Object> data = MapUtils.getResult(pageResult);
return AjaxResult.success(data);
@@ -141,7 +141,7 @@
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
-
+
}
}
--
Gitblit v1.9.1