Skip to content

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

修改同步用户

parent 31113165
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
View file @ ec769954
...@@ -82,8 +82,10 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic ...@@ -82,8 +82,10 @@ 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
RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode())); RoomDeviceQuery roomDeviceQuery = new RoomDeviceQuery();
query.setDeviceCode(null); roomDeviceQuery.setDeviceCode(query.getDeviceCode());
RoomDeviceEntity roomEntity = roomDeviceService.selectOne(roomDeviceQuery);
log.info("deviceCode:{}",roomDeviceQuery.getDeviceCode());
if (!ObjectUtils.isEmpty(roomEntity)) { if (!ObjectUtils.isEmpty(roomEntity)) {
// query.setIdList(Arrays.asList(roomEntity.getRoomId())); // query.setIdList(Arrays.asList(roomEntity.getRoomId()));
query.setId(roomEntity.getRoomId()); query.setId(roomEntity.getRoomId());
...@@ -91,6 +93,7 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic ...@@ -91,6 +93,7 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
// query.setIdList(Arrays.asList(-1L)); // query.setIdList(Arrays.asList(-1L));
query.setId(-1L); query.setId(-1L);
} }
query.setDeviceCode(null);
} }
} }
} }
\ No newline at end of file
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