From c320cc86740e185af220e7a7bc87bc69dab58804 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <8153694@qq.com>
Date: Tue, 30 May 2023 09:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AB=99=E7=82=B9=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/module/site/service/impl/SiteServiceImpl.java | 1 -
.../com/mortals/xhx/module/site/web/SiteController.java | 9 ++++-----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
index 2f1d477a..af399b79 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
@@ -469,7 +469,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
List<AreaEntity> childList = areaService.find(areaQuery, context);
for (AreaEntity child : childList) {
siteAreaVo = new SiteAreaVo();
-
siteAreaVo.setAreaCode(child.getAreaCode());
siteAreaVo.setAreaName(child.getName());
String matchCode = child.getAreaCode().replaceAll("(0)+$", "");
diff --git a/base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java b/base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
index 27804346..f67a3846 100644
--- a/base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
+++ b/base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
@@ -35,10 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -178,7 +175,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}
}
-
+ if(ObjectUtils.isEmpty(site.getAreaCodeList())){
+ site.setAreaCodeList(Arrays.asList(site.getAreaCode()));
+ }
List<SiteEntity> siteEntityList =site.getAreaCodeList().stream().flatMap(areaCode->{
return this.service.getFlatSitesByAreaCode(areaCode, getContext()).stream();
}).distinct().collect(Collectors.toList());
--
2.24.3