From 4dff39db1e80e2c2dff1cf70f5ba9b199b5ebdc7 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Fri, 29 Jul 2022 11:36:27 +0800
Subject: [PATCH] 溯源码详情查询修改

---
 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