Merge branch 'dev'

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/HouseResourcePageQuery.java

@@ -53,4 +53,6 @@ public class HouseResourcePageQuery extends PageDomain {
     private boolean xzFlag;
 
     private boolean gkFlag;
+
+    private boolean zyzyFlag;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -213,6 +213,9 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (query.isGkFlag()) {
             houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceType() == 2).collect(Collectors.toList());
         }
+        if (query.isZyzyFlag()) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceType() == 4).collect(Collectors.toList());
+        }
         List<HouseResourceProfileGraph> resourceProfileGraphList = new ArrayList<>();
         Map<String, List<HouseResourcePage>> collect = houseResourcePages.stream().collect(Collectors.groupingBy(HouseResourcePage::getFour));
         collect.forEach((k, v) -> {