Merge branch 'dev-lx' into dev

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

@@ -55,4 +55,6 @@ public class HouseResourcePageQuery extends PageDomain {
     private boolean gkFlag;
 
     private boolean zyzyFlag;
+
+    private String fourOrHouseNumber;
 }

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

@@ -262,18 +262,17 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                         BeanUtils.copyProperties(houseResource, houseResourcePage);
                         pageList.add(houseResourcePage);
                     }
-                    pageList.forEach(x -> x.setIncome(businessEntityInfoMapper.selectYearSellByHouseResourceId(x.getId())));
-                    if (Objects.nonNull(query.getYearSellMin())) {
-                        pageList = pageList.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMin()) >= 0).collect(Collectors.toList());
+                    if (StringUtils.hasText(query.getFourOrHouseNumber())) {
+                        pageList = pageList.stream().filter(x -> x.getHouseNumber().contains(query.getFourOrHouseNumber()) || x.getFour().contains(query.getFourOrHouseNumber())).collect(Collectors.toList());
                     }
-                    if (Objects.nonNull(query.getYearSellMax())) {
-                        pageList = pageList.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMax()) <= 0).collect(Collectors.toList());
+                    if (!CollectionUtils.isEmpty(pageList)) {
+                        houseResourceProfileGraph.setHouseResources(handleHouseList(pageList));
+                        result.add(houseResourceProfileGraph);
+                        result = result.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getId)).collect(Collectors.toList());
                     }
-                    houseResourceProfileGraph.setHouseResources(handleHouseList(pageList));
-                    result.add(houseResourceProfileGraph);
                 }
             }
-            return result.stream().sorted(Comparator.comparing(HouseResourceProfileGraph::getId)).collect(Collectors.toList());
+            return result;
         }
         return Collections.emptyList();
     }