修改同步用户

smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java

@@ -70,7 +70,7 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
             //根据设备编码 查询房间room
             RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode()));
             if (!ObjectUtils.isEmpty(roomEntity)) {
-                query.setRoomId(roomEntity.getId());
+                query.setRoomId(roomEntity.getRoomId());
             } else {
                 query.setRoomId(-1L);
             }

smart-office-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -84,9 +84,11 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         if (!ObjectUtils.isEmpty(query.getDeviceCode())) {
             //根据设备编码 查询房间room
             RoomDeviceEntity roomEntity = roomDeviceService.selectOne(new RoomDeviceQuery().deviceCode(query.getDeviceCode()));
+
             if (!ObjectUtils.isEmpty(roomEntity)) {
-                query.setRoomId(roomEntity.getId());
+                query.setRoomId(roomEntity.getRoomId());
             }else{
+                log.info("deviceCode:{}",query.getDeviceCode());
                 query.setRoomId(-1L);
             }
         }

smart-office-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http

@@ -19,7 +19,8 @@ Content-Type: application/json
 
 {
     "page":1,
-    "size":10
+    "size":-1,
+  "deviceCode":"a0-9f-10-5a-e0-10"
 }