Commit 6cf02c12 by guojuxing

查询自定义字段添加门店域筛选查询

parent 79b1bdf0
......@@ -2,6 +2,7 @@ package com.gic.store.web.controller;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.gic.auth.constant.SignConstants;
import org.apache.commons.lang3.StringUtils;
......@@ -218,12 +219,14 @@ public class StoreFieldController {
Set<String> valueSet = new HashSet<>(Arrays.asList(e.getValue().split(SignConstants.UNDERLINE)));
return searchSet
.stream()
.anyMatch(regionId -> valueSet.contains(regionId));
.anyMatch(regionId -> "-9999".equals(regionId) || valueSet.contains(regionId));
})
.map(e -> e.getKey())
.collect(Collectors.toList());
ServiceResponse<Page<StoreFieldDTO>> result = storeFieldApiService.listStoreField(storeFieldIdList,
ServiceResponse<Page<StoreFieldDTO>> result = storeFieldApiService.listStoreField(
storeFieldIdList.size() < 1 ? Stream.of(-9999).collect(Collectors.toList()) : storeFieldIdList,
UserDetailUtils.getUserDetail().getEnterpriseId(), search, pageQO.getCurrentPage(),
pageQO.getPageSize());
if (result.isSuccess()) {
......
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