Skip to content

S
smart-office-platform
Commit 2fe0243b authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改同步用户

parent d8dbe70f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 9 deletions
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
View file @ 2fe0243b
...@@ -82,17 +82,14 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic ...@@ -82,17 +82,14 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
if (!ObjectUtils.isEmpty(query.getDeviceCode())) { if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
//根据设备编码 查询房间room //根据设备编码 查询房间room
log.info("deviceCode:{}",query.getDeviceCode()); query.setDeviceCode(null);
RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode())); RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode()));
// RoomEntity roomEntity = this.service.selectOne(new RoomQuery().deviceCode(query.getDeviceCode())); if (!ObjectUtils.isEmpty(roomEntity)) {
if (!ObjectUtils.isEmpty(roomEntity)) { // query.setIdList(Arrays.asList(roomEntity.getRoomId()));
log.info("roomId:{}",roomEntity.getRoomId()); query.setId(roomEntity.getRoomId());
query.setIdList(Arrays.asList(roomEntity.getRoomId()));
//query.setId(roomEntity.getRoomId());
}else{ }else{
log.info("roomEntity is null deviceCode:{}",query.getDeviceCode()); // query.setIdList(Arrays.asList(-1L));
query.setIdList(Arrays.asList(-1L)); query.setId(-1L);
//query.setId(-1L);
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment