From 9d9928e3a79c202c1718f7fec7c154090627eaba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 10:45:16 +0800
Subject: [PATCH] 农资管理添加农场过滤条件，修复出入库记录表删除回滚问题
---
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