调整

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

@@ -100,8 +100,6 @@ public class ExtendContentController extends BaseController {
             IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
 
         List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
-        List<String> collect = taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList());
-        collect.add(null);
         QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(cityId != null, "city_id", cityId);
             queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
@@ -111,7 +109,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-            queryWrapper.in(taPersonBuildingList.size() > 0,"building_id",collect);
+            queryWrapper.and(wapper -> wapper.in(taPersonBuildingList.size() > 0,"building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);