From b3ac24bb01fdb209b0298661537acf50ec5cba3c Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 27 Jan 2024 11:41:01 +0800
Subject: [PATCH] 场所新增字段，场所查询修改（扫码报错）
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 481f502..6b390d2 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -599,36 +599,36 @@
// 查询场所信息
PlaceVO placeVO = baseMapper.getDetail(place);
// 门牌信息
- if (null!= place.getAddressType() && place.getAddressType()==4){
- if (null != placeVO) {
+ if (null != placeVO) {
+ if (null != place.getAddressType() && place.getAddressType() == 4) {
// 查询地址编码信息（社区派出所相关信息）
DoorplateAddressEntity addressEntity = placeRelService.getDoorplateAddressEntity(placeVO);
placeVO.setDoorplateAddressEntity(addressEntity);
// 查询网格信息--商超
placeVO.setGrid(gridService.getGridDetailByParam(placeVO));
- }
- }else {
- // 管理后台查询赋值颜色
- if (placeVO.getPlacePoiLabelVOList().size()>0){
- PlacePoiLabelVO placePoiLabelVO = placeVO.getPlacePoiLabelVOList().get(0);
- if (!Strings.isBlank(placePoiLabelVO.getColor())){
- placeVO.setColor(placePoiLabelVO.getColor());
+ } else {
+ // 管理后台查询赋值颜色
+ if (placeVO.getPlacePoiLabelVOList().size() > 0) {
+ PlacePoiLabelVO placePoiLabelVO = placeVO.getPlacePoiLabelVOList().get(0);
+ if (!Strings.isBlank(placePoiLabelVO.getColor())) {
+ placeVO.setColor(placePoiLabelVO.getColor());
+ }
}
+ // 查询地址门牌信息
+ QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("address_code", placeVO.getHouseCode());
+ List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
+ if (list.size() > 0) {
+ placeVO.setDoorplateAddressEntity(list.get(0));
+ placeVO.setNeiCode(list.get(0).getNeiCode());
+ }
+ // 查询场所对应的网格数据
+ placeVO.setGrid(gridService.getPlaceGridDetailByHouseCode(placeVO.getHouseCode()));
+ // 设置详情信息
+ QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted", 0).eq("place_id", placeVO.getId());
+ placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
}
- // 查询地址门牌信息
- QueryWrapper<DoorplateAddressEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("address_code", placeVO.getHouseCode());
- List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
- if (list.size() > 0) {
- placeVO.setDoorplateAddressEntity(list.get(0));
- placeVO.setNeiCode(list.get(0).getNeiCode());
- }
- // 查询场所对应的网格数据
- placeVO.setGrid(gridService.getPlaceGridDetailByHouseCode(placeVO.getHouseCode()));
- // 设置详情信息
- QueryWrapper<PlaceExtEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0).eq("place_id",placeVO.getId());
- placeVO.setPlaceExtEntity(placeExtService.getOne(queryWrapper));
}
// 返回
return placeVO;
--
Gitblit v1.9.3