Browse Source

bugfix:消费设备-从校区管理页面新增同步过来的区域,查询条件未生效,应该是没有设备的,却查询到了全部;

bing 5 days ago
parent
commit
28a7688802

+ 3 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -84,6 +84,9 @@ public class XfTermServiceImpl implements IXfTermService {
84 84
                 List<PtRoomVo> ptRoomVos = roomService.queryRoomByAreaId(Long.parseLong(roomId1.toString()));
85 85
                 if(CollectionUtil.isNotEmpty(ptRoomVos)){
86 86
                     roomIds.addAll(ptRoomVos.stream().map(PtRoomVo::getRoomId).toList());
87
+                }else{
88
+                    // 没有房间id 则不用查询了
89
+                    return TableDataInfo.build(new Page<>());
87 90
                 }
88 91
             }else {
89 92
                 roomIds.add(Long.valueOf(roomId1.toString()));