diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java
index f22d1bc60..becf028c6 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/controller/FeedbackController.java
@@ -194,7 +194,7 @@ public class FeedbackController {
         
         List<FeedbackTypeVO> voList = dictResult.getData().stream().map(item -> {
             FeedbackTypeVO vo = new FeedbackTypeVO();
-            vo.setId(item.getId());
+            vo.setId(item.getItemValue());
             vo.setLabel(item.getLabel());
             return vo;
         }).collect(Collectors.toList());
diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java
index 28990e28d..7fba6f673 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/MeetingRoomServiceImpl.java
@@ -205,12 +205,22 @@ public class MeetingRoomServiceImpl extends ServiceImpl<MeetingRoomMapper, Meeti
         queryWrapper.in(MeetingRoomEquipmentEntity::getRoomId, roomIds);
         List<MeetingRoomEquipmentEntity> equipmentList = meetingRoomEquipmentMapper.selectList(queryWrapper);
 
+        // 如果没有任何设备关联记录，直接返回空Map
+        if (CollectionUtils.isEmpty(equipmentList)) {
+            return Collections.emptyMap();
+        }
+
         // 2. 查询设备详细信息
         List<Long> equipIds = equipmentList.stream()
                 .map(MeetingRoomEquipmentEntity::getEquipId)
                 .distinct()
                 .collect(Collectors.toList());
 
+        // 如果设备ID列表为空，也直接返回空Map
+        if (CollectionUtils.isEmpty(equipIds)) {
+            return Collections.emptyMap();
+        }
+
         Map<Long, MeetingEquipmentEntity> equipmentInfoMap = meetingEquipmentMapper.selectBatchIds(equipIds)
                 .stream()
                 .collect(Collectors.toMap(MeetingEquipmentEntity::getId, e -> e));
diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java
index d396d2125..e053cc989 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java
@@ -21,7 +21,7 @@ public class FeedbackTypeVO implements Serializable {
      * 字典项ID
      */
     @Schema(description = "字典项ID")
-    private Long id;
+    private String id;
 
     /**
      * 标签名称