Merge branch 'dev-lx' into dev

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

@@ -265,7 +265,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                         pageList.add(houseResourcePage);
                     }
                     if (StringUtils.hasText(query.getFourOrHouseNumber())) {
-                        pageList = pageList.stream().filter(x -> x.getHouseNumber().equals(query.getFourOrHouseNumber()) || x.getFour().equals(query.getFourOrHouseNumber())).collect(Collectors.toList());
+                        pageList = pageList.stream().filter(x -> StringUtils.hasText(x.getHouseNumber())).filter(x -> x.getHouseNumber().equals(query.getFourOrHouseNumber()) || x.getFour().equals(query.getFourOrHouseNumber())).collect(Collectors.toList());
                     }
                     if (!CollectionUtils.isEmpty(pageList)) {
                         houseResourceProfileGraph.setHouseResources(handleHouseList(pageList));