diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java index 723d5cb39..2869a4b4a 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaTreeVO.java @@ -1,12 +1,14 @@ package com.cool.store.vo; import com.cool.store.entity.HyOpenAreaInfoDO; +import com.cool.store.enums.AreaStatusEnum; import com.google.common.collect.Lists; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.List; @@ -49,7 +51,7 @@ public class OpenAreaTreeVO { private List childNode; - public static List convertTree(List allOpenArea, String keyword){ + public static List convertTree(List allOpenArea, String keyword, Boolean applyFlag){ long startTime = System.currentTimeMillis(); List firstArea = allOpenArea.stream().filter(o -> Objects.isNull(o.getParentId())).collect(Collectors.toList()); Map> openAreaParentMap = allOpenArea.stream().filter(o->Objects.nonNull(o.getParentId())).collect(Collectors.groupingBy(k -> k.getParentId())); @@ -62,7 +64,8 @@ public class OpenAreaTreeVO { } log.info("1#耗时:{}", System.currentTimeMillis() - startTime); Map> childMap = allTree.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getChildNode())); - List filterList = allOpenArea.stream().filter(o -> o.getAreaPath().contains(keyword)).collect(Collectors.toList()); + List filterList = allOpenArea.stream().filter(o -> StringUtils.isNotBlank(keyword) && o.getAreaPath().contains(keyword)) + .filter(o->Objects.nonNull(applyFlag) && AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus()) || AreaStatusEnum.OPEN.getCode().equals(o.getAreaStatus())).collect(Collectors.toList()); Map openAreaMap = allOpenArea.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity())); List list = new ArrayList<>(); //向上处理节点 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index 919ce4e71..b19459c29 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -122,7 +122,7 @@ public class OpenAreaServiceImpl implements OpenAreaService { //先查出所有的一级菜单 List allOpenArea = hyOpenAreaInfoDAO.getAllOpenArea(); log.info("11耗时:{}", System.currentTimeMillis() - startTime); - return OpenAreaTreeVO.convertTree(allOpenArea, keyword); + return OpenAreaTreeVO.convertTree(allOpenArea, keyword, applyFlag); } @Override diff --git a/coolstore-partner-webb/pom.xml b/coolstore-partner-webb/pom.xml index 8f1a633b8..d6ef7b991 100644 --- a/coolstore-partner-webb/pom.xml +++ b/coolstore-partner-webb/pom.xml @@ -94,14 +94,6 @@ jacoco-maven-plugin - - - src/main/resources - - **/* - - - compile