From 125a6f192ed7e611739f8648cf036360f600c41b Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 29 一月 2024 17:27:44 +0800
Subject: [PATCH] 修改客户反馈的bug
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
index cb868cc..e830302 100644
--- a/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java
@@ -186,8 +186,10 @@
SearchHouseResourceRes searchHouseResource = new SearchHouseResourceRes();
List<SearchHouseResourceListRes> searchHouseResourceListRes = this.baseMapper.searchHouseResource(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
+
// 如果有根据用户历史来搜索必看 如果没有搜索出数据 那么查询所有必看
- if (req.getDataType()!=null&&req.getDataType()==1 && (!StringUtils.hasLength(req.getDistrict())) && searchHouseResourceListRes!=null&&searchHouseResourceListRes.size()==0){
+ if (req.getDataType()!=null&&req.getDataType()==1 && (!StringUtils.hasLength(req.getDistrict()))
+ && searchHouseResourceListRes!=null&&searchHouseResourceListRes.size()==0){
cityIds=null;
districtIds=null;
searchHouseResourceListRes = this.baseMapper.searchHouseResource(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
@@ -198,6 +200,22 @@
t.setHouseResource(3);
}
}
+ if (req.getUserType()==5){
+ // 中介房源
+ List<SearchHouseResourceListRes> collect = searchHouseResourceListRes.stream()
+ .filter(t -> t.getHouseResource() == 3)
+ .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
+ .collect(Collectors.toList());
+
+ // 个人房源
+ List<SearchHouseResourceListRes> collect1 = searchHouseResourceListRes.stream()
+ .filter(t -> t.getHouseResource() == 2)
+ .sorted(Comparator.comparing(SearchHouseResourceListRes::getInsertTime).reversed())
+ .collect(Collectors.toList());
+ searchHouseResourceListRes = collect;
+ searchHouseResourceListRes.addAll(collect1);
+ }
+
searchHouseResource.setList(searchHouseResourceListRes);
List<SearchHouseResourceListRes> searchHouseResourceListRes1 = this.baseMapper.searchHouseResource1(req, cityIds, districtIds, saleAmountStart, saleAmountEnd, houseModels, houseTypeIds);
searchHouseResource.setTotal(searchHouseResourceListRes1.size());
--
Gitblit v1.7.1