Merge branch 'dev-lx' into dev

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

@@ -262,6 +262,13 @@ 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 (Objects.nonNull(query.getYearSellMax())) {
+                        pageList = pageList.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMax()) <= 0).collect(Collectors.toList());
+                    }
                     houseResourceProfileGraph.setHouseResources(handleHouseList(pageList));
                     result.add(houseResourceProfileGraph);
                 }