Commit c320cc86 authored by 赵啸非's avatar 赵啸非

添加站点更新日志

parent db1f5b33
...@@ -469,7 +469,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -469,7 +469,6 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
List<AreaEntity> childList = areaService.find(areaQuery, context); List<AreaEntity> childList = areaService.find(areaQuery, context);
for (AreaEntity child : childList) { for (AreaEntity child : childList) {
siteAreaVo = new SiteAreaVo(); siteAreaVo = new SiteAreaVo();
siteAreaVo.setAreaCode(child.getAreaCode()); siteAreaVo.setAreaCode(child.getAreaCode());
siteAreaVo.setAreaName(child.getName()); siteAreaVo.setAreaName(child.getName());
String matchCode = child.getAreaCode().replaceAll("(0)+$", ""); String matchCode = child.getAreaCode().replaceAll("(0)+$", "");
......
...@@ -35,10 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -35,10 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -178,7 +175,9 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic ...@@ -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->{ List<SiteEntity> siteEntityList =site.getAreaCodeList().stream().flatMap(areaCode->{
return this.service.getFlatSitesByAreaCode(areaCode, getContext()).stream(); return this.service.getFlatSitesByAreaCode(areaCode, getContext()).stream();
}).distinct().collect(Collectors.toList()); }).distinct().collect(Collectors.toList());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment