Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
package com.cool.store.dto.content;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContentQueryTitlesDto {
|
||||
|
||||
@ApiModelProperty("用户输入标题")
|
||||
private String tittle;
|
||||
|
||||
}
|
||||
@@ -62,6 +62,10 @@ public class OpenAreaTreeVO {
|
||||
node.setChildNode(childList);
|
||||
allTree.add(node);
|
||||
}
|
||||
//不需要过滤 直接返回
|
||||
if(StringUtils.isBlank(keyword) && (Objects.isNull(applyFlag) || !applyFlag)){
|
||||
return allTree;
|
||||
}
|
||||
log.info("1#耗时:{}", System.currentTimeMillis() - startTime);
|
||||
Map<Long, List<OpenAreaTreeVO>> childMap = allTree.stream().collect(Collectors.toMap(k -> k.getId(), v -> v.getChildNode()));
|
||||
List<HyOpenAreaInfoDO> filterList = allOpenArea.stream().filter(o -> (StringUtils.isBlank(keyword) || o.getAreaPath().contains(keyword))
|
||||
|
||||
Reference in New Issue
Block a user