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/sale/service/impl/SaleServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
index 2e52e92..1d69554 100644
--- a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
@@ -44,7 +44,11 @@
 		saleVO.forEach(new Consumer<SaleVO>() {
 			@Override
 			public void accept(SaleVO saleVO) {
-				saleVO.setSaleDestination2(saleVO.getDistrict()+saleVO.getCityName()+saleVO.getCountyName());
+				if (saleVO.getCityName() != null) {
+					saleVO.setSaleDestination2(saleVO.getDistrict() + saleVO.getCityName() + saleVO.getCountyName());
+				}else {
+					saleVO.setSaleDestination2(saleVO.getDistrict());
+				}
 			}
 		});
 		return page.setRecords(saleVO);

--
Gitblit v1.9.3