Browse Source

bugfix:房间信息导出时没有根据查询条件区域id进行数据的导出

bing 1 year ago
parent
commit
59c9bc2a2a

+ 12 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtRoomServiceImpl.java

@@ -110,7 +110,18 @@ public class PtRoomServiceImpl implements IPtRoomService {
      */
     @Override
     public List<PtRoomVo> queryList(PtRoomBo bo) {
-        LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper(bo);
+        LambdaQueryWrapper<PtRoom> lqw = buildQueryWrapper2(bo);
+        if(bo.getAreaId()!=null){
+            List<PtAreaVo> ptAreaVos = areaService.queryListLD(bo.getAreaId());
+            if(CollectionUtil.isNotEmpty(ptAreaVos)){
+                List<Long> areaIds = ptAreaVos.stream().map(PtAreaVo::getAreaId).toList();
+                lqw.in(PtRoom::getAreaId, areaIds);
+            }else{
+                lqw.eq(PtRoom::getAreaId, bo.getAreaId());
+            }
+
+        }
+        lqw.orderByDesc(PtRoom::getCreateTime);
         List<PtRoomVo> ptRoomVos = baseMapper.selectVoList(lqw);
         setAreaName(ptRoomVos);
         return ptRoomVos;