From 342191507547c37aaceaf6412d360bfb2dde7f69 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 25 Jul 2022 09:37:17 +0800
Subject: [PATCH] 地区显示为null去除

---
 src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java b/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
index 06e117d..901cd47 100644
--- a/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/retrieval/service/impl/RetrievalServiceImpl.java
@@ -42,7 +42,11 @@
 		retrievalVO.forEach(new Consumer<RetrievalVO>() {
 			@Override
 			public void accept(RetrievalVO retrievalVO) {
-				retrievalVO.setSaleDestination2(retrievalVO.getDistrict()+retrievalVO.getCityName()+retrievalVO.getCountyName());
+				if (retrievalVO.getCityName() != null) {
+					retrievalVO.setSaleDestination2(retrievalVO.getDistrict() + retrievalVO.getCityName() + retrievalVO.getCountyName());
+				}else {
+					retrievalVO.setSaleDestination2(retrievalVO.getDistrict());
+				}
 			}
 		});
 		return page.setRecords(retrievalVO);

--
Gitblit v1.9.3