9月迭代:企业微信列表查询过滤

haoban-manage3-operation-web/src/main/java/com/gic/haoban/manage/web/controller/EnterpriseController.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -58,7 +59,7 @@ public class EnterpriseController extends WebBaseController {
     //企业列表
     // openTagFlag 0 未开启 1 开启 2 所有
     @RequestMapping("wx-enterprise-list")
-    public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo, String keyword, int openTagFlag, String gicEnterpriseName, Integer gicContactHelper, String version) {
+    public HaobanResponse wxEnterpriseList(BasePageInfo pageInfo, String keyword, Integer openTagFlag, String gicEnterpriseName, Integer gicContactHelper, String version) {
         List<String> wxEnterpriseIds = new ArrayList<String>();
         if (!StringUtils.isEmpty(gicEnterpriseName)) {
             List<EnterpriseDTO> enterpriseNames = enterpriseService.getEnterpriseByName(gicEnterpriseName);
@@ -86,26 +87,25 @@ public class EnterpriseController extends WebBaseController {
         PageResult<YwWxEnterpriseDTO> pageVo = new PageResult<>();
         List<YwWxEnterpriseDTO> list = EntityUtil.changeEntityListByJSON(YwWxEnterpriseDTO.class, page.getResult());
 
-        Set<String> finalWxEntIdSet = wxEntIdSet;
-        list.stream().filter(one -> {
-            if (openTagFlag == 0) {
-                return !finalWxEntIdSet.contains(one.getWxEnterpriseId());
-            }
-            if (openTagFlag == 1) {
-                return finalWxEntIdSet.contains(one.getWxEnterpriseId());
-            }
-            if (openTagFlag == 2) {
-                return true;
-            }
-            return true;
-        }).forEach(dto -> {
+        List<YwWxEnterpriseDTO> resList = Lists.newArrayListWithCapacity(list.size());
+
+        for (YwWxEnterpriseDTO dto : list) {
             dto.setVersion("3.0");
             dto.setBuyDate(new Date());
             dto.setBuyStatus("1");
             List<EnterpriseDetailDTO> counts = wxEnterpriseRelatedApiService.listEnterpriseByWxEnterpriseId(dto.getWxEnterpriseId());
             dto.setRelationCount(counts.size());
-            dto.setTagOpenFlag(finalWxEntIdSet.contains(dto.getWxEnterpriseId()) ? 1 : 0);
-        });
+            if (openTagFlag == 0 && !wxEntIdSet.contains(dto.getWxEnterpriseId())) {
+                dto.setTagOpenFlag(0);
+                resList.add(dto);
+            } else if (openTagFlag == 1 && wxEntIdSet.contains(dto.getWxEnterpriseId())) {
+                dto.setTagOpenFlag(1);
+                resList.add(dto);
+            } else if (openTagFlag == 2) {
+                dto.setTagOpenFlag(wxEntIdSet.contains(dto.getWxEnterpriseId()) ? 1 : 0);
+                resList.add(dto);
+            }
+        }
 
         pageVo.setList(list);
         pageVo.setPageNum(page.getCurrentPage());