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

gic-store-web/src/main/java/com/gic/store/web/controller/StoreFieldController.java

@@ -207,25 +207,18 @@ public class StoreFieldController {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         ServiceResponse<Map<Integer, String>> storeFieldIdMapResult = storeFieldApiService
                 .storeFieldIdMapRegionId(enterpriseId);
-         new HashMap<>(16);
+        //
+        Set<String> searchSet = new HashSet<>(Arrays.asList(Optional.ofNullable(regionIds).orElse("-9999").split(SignConstants.COMMA)));
         if (storeFieldIdMapResult.isSuccess()) {
             Map<Integer, String> storeFieldIdMapRegionIds = storeFieldIdMapResult.getResult();
             List<Integer> storeFieldIdList = Optional.ofNullable(storeFieldIdMapRegionIds).orElse(new HashMap<>(2))
                     .entrySet()
                     .stream()
                     .filter(e -> {
-                        Set<String> searchSet = new HashSet<>(Arrays.asList(Optional.ofNullable(regionIds).orElse("").split(SignConstants.COMMA)));
-                        searchSet
+                        Set<String> valueSet = new HashSet<>(Arrays.asList(e.getValue().split(SignConstants.UNDERLINE)));
+                        return searchSet
                                 .stream()
-                                .filter(regionId -> {
-                                    Set<String> valueSet = new HashSet<>(Arrays.asList(e.getValue().split(SignConstants.UNDERLINE)));
-                                    if (valueSet.contains(regionId)) {
-                                        return true;
-                                    } else {
-                                        return false;
-                                    }
-                                });
-                        return true;
+                                .anyMatch(regionId -> valueSet.contains(regionId));
                     })
                     .map(e -> e.getKey())
                     .collect(Collectors.toList());