From cef87e5c90c5551df2f98047e113530d79270e9f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 17 一月 2024 14:30:51 +0800
Subject: [PATCH] 修改附近方圆报错
---
guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/HouseResourceService.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 f1dad37..cb868cc 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
@@ -369,7 +369,9 @@
List<Integer> ids = pointLocations.stream().map(PointLocation::getHouseId).collect(Collectors.toList());
if (ids.size()!= 0){
List<HouseResource> houseResources = this.selectBatchIds(ids);
- List<HouseResource> collect = houseResources.stream().filter(t -> !t.getId().equals(id) && t.getAuthStatus() == 2 && t.getType() == 2
+ List<HouseResource> collect = houseResources.stream()
+ .filter(t -> !t.getId().equals(id)
+ && t.getAuthStatus() == 2 && t.getType() == 2
&& t.getStatus() == 1 && t.getIsDelete() == 0 && t.getDataType() == houseResource.getDataType())
.collect(Collectors.toList());
List<SearchHouseResourceListRes> list = new ArrayList<>();
@@ -379,13 +381,17 @@
searchHouseResourceListRes.setId(resource.getId());
AppUser appUser = appUserService.selectById(resource.getAppUserId());
searchHouseResourceListRes.setHouseResource(appUser.getUserType());
- searchHouseResourceListRes.setImgUrl(resource.getHousePhoto().split(",")[0]);
+ if(StringUtils.hasLength(resource.getHousePhoto())){
+ searchHouseResourceListRes.setImgUrl(resource.getHousePhoto().split(",")[0]);
+ }
searchHouseResourceListRes.setTitle(resource.getTitle());
searchHouseResourceListRes.setHouseArea(resource.getHouseArea());
searchHouseResourceListRes.setHouseModel(resource.getHouseModel());
Region region = regionService.selectById(houseResource.getDistrictId());
Region region1 = regionService.selectById(houseResource.getCityId());
- searchHouseResourceListRes.setAddress(region1.getName() + " > " + region.getName() + "/" + houseResource.getHouseAddress());
+ if (region!=null && region1!=null){
+ searchHouseResourceListRes.setAddress(region1.getName() + " > " + region.getName() + "/" + houseResource.getHouseAddress());
+ }
searchHouseResourceListRes.setSaleAmount(resource.getSaleAmount().doubleValue());
searchHouseResourceListRes.setElevator(resource.getElevator());
searchHouseResourceListRes.setDryingArea(resource.getDryingArea());
@@ -456,6 +462,11 @@
houseResource.setPlatform(req.getPlatform());
BeanUtils.copyProperties(req,houseResource);
houseResource.setType(req.getType());
+ if (StringUtils.hasLength(req.getHousePhoto())){
+ houseResource.setHousePhoto(req.getHousePhoto());
+ }else{
+ houseResource.setHousePhoto("");
+ }
houseResource.setInsertTime(new Date());
houseResource.setGoodHouse(0);
houseResource.setIsDelete(0);
@@ -478,14 +489,18 @@
}
if (req.getType()==2){
if (req.getId()==null){
+ houseResource.setAuthStatus(2);
this.baseMapper.insert(houseResource);
}else{
+ houseResource.setAuthStatus(2);
this.baseMapper.updateById(houseResource);
}
}else{
if (req.getId()==null){
+ houseResource.setAuthStatus(2);
this.baseMapper.insert(houseResource);
}else{
+ houseResource.setAuthStatus(2);
this.baseMapper.updateById(houseResource);
}
}
@@ -496,6 +511,7 @@
pointLocation.setHouseId(houseResource.getId());
mongoTemplate.insert(pointLocation);
houseResource.setCode(pointLocation.getId());
+ houseResource.setAuthStatus(2);
this.baseMapper.updateById(houseResource);
InputStream inputStream = null;
OutputStream outputStream = null;
@@ -565,6 +581,7 @@
pointLocation.setHouseId(req.getId());
mongoTemplate.insert(pointLocation);
houseResource1.setCode(pointLocation.getId());
+ houseResource1.setAuthStatus(2);
this.baseMapper.updateById(houseResource1);
}
Query query = Query.query(Criteria.where("_id").is(houseResource1.getCode()));
--
Gitblit v1.7.1