|
@@ -100,6 +100,8 @@ public class ExtendContentController extends BaseController {
|
100
|
100
|
IPage<ExtendContent> pg = new Page<>(pageNum, pageSize);
|
101
|
101
|
|
102
|
102
|
List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
|
|
103
|
+ List<String> collect = taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList());
|
|
104
|
+ collect.add(null);
|
103
|
105
|
QueryWrapper<ExtendContent> queryWrapper = new QueryWrapper<>();
|
104
|
106
|
queryWrapper.eq(cityId != null, "city_id", cityId);
|
105
|
107
|
queryWrapper.eq(StringUtils.isNotBlank(buildingId), "building_id", buildingId);
|
|
@@ -109,7 +111,7 @@ public class ExtendContentController extends BaseController {
|
109
|
111
|
queryWrapper.ne("status",9);
|
110
|
112
|
queryWrapper.eq(status != null, "status", status);
|
111
|
113
|
queryWrapper.eq( "org_id", getOrgId(request));
|
112
|
|
- queryWrapper.in(taPersonBuildingList.size() > 0,"building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
|
|
114
|
+ queryWrapper.in(taPersonBuildingList.size() > 0,"building_id",collect);
|
113
|
115
|
queryWrapper.orderByDesc("create_date");
|
114
|
116
|
IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
|
115
|
117
|
|