|
@@ -110,7 +110,18 @@ public class PtRoomServiceImpl implements IPtRoomService {
|
110
|
110
|
*/
|
111
|
111
|
@Override
|
112
|
112
|
public List<PtRoomVo> queryList(PtRoomBo bo) {
|
113
|
|
- LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper(bo);
|
|
113
|
+ LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper2(bo);
|
|
114
|
+ if(bo.getAreaId()!=null){
|
|
115
|
+ List<PtAreaVo> ptAreaVos = areaService.queryListLD(bo.getAreaId());
|
|
116
|
+ if(CollectionUtil.isNotEmpty(ptAreaVos)){
|
|
117
|
+ List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();
|
|
118
|
+ lqw.in(PtRoom::getAreaId, areaIds);
|
|
119
|
+ }else{
|
|
120
|
+ lqw.eq(PtRoom::getAreaId, bo.getAreaId());
|
|
121
|
+ }
|
|
122
|
+
|
|
123
|
+ }
|
|
124
|
+ lqw.orderByDesc(PtRoom::getCreateTime);
|
114
|
125
|
List<PtRoomVo> ptRoomVos = baseMapper.selectVoList(lqw);
|
115
|
126
|
setAreaName(ptRoomVos);
|
116
|
127
|
return ptRoomVos;
|