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

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

 package com.gic.store.web.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
+import com.gic.auth.constant.SignConstants;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -204,17 +203,32 @@ public class StoreFieldController {
     }
 
     @RequestMapping("/list-store-field")
-    public RestResponse listStoreField(String search, PageQO pageQO) {
+    public RestResponse listStoreField(String search, PageQO pageQO, String regionIds) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         ServiceResponse<Map<Integer, String>> storeFieldIdMapResult = storeFieldApiService
                 .storeFieldIdMapRegionId(enterpriseId);
-        Map<Integer, String> storeFieldIdMapRegionIds = new HashMap<>(16);
-        List<Integer> storeFieldIdList = new ArrayList<>();
+         new HashMap<>(16);
         if (storeFieldIdMapResult.isSuccess()) {
-            storeFieldIdMapRegionIds = storeFieldIdMapResult.getResult();
-            for (Map.Entry<Integer, String> entry : storeFieldIdMapRegionIds.entrySet()) {
-                storeFieldIdList.add(entry.getKey());
-            }
+            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
+                                .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;
+                    })
+                    .map(e -> e.getKey())
+                    .collect(Collectors.toList());
 
             ServiceResponse<Page<StoreFieldDTO>> result = storeFieldApiService.listStoreField(storeFieldIdList,
                     UserDetailUtils.getUserDetail().getEnterpriseId(), search, pageQO.getCurrentPage(),