From cfdaeea133776a7378e42cfa1cb4a7e88bd44652 Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Fri, 10 Oct 2025 15:37:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E5=85=B8=E5=8F=96?= =?UTF-8?q?=E5=80=BC=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BC=9A=E8=AE=AE=E5=AE=A4?= =?UTF-8?q?=E4=B8=8D=E5=85=B3=E8=81=94=E8=AE=BE=E5=A4=87=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integrated/controller/FeedbackController.java | 2 +- .../service/impl/MeetingRoomServiceImpl.java | 10 ++++++++++ .../com/bsd/pjcloud/integrated/vo/FeedbackTypeVO.java | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) 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 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 equipmentList = meetingRoomEquipmentMapper.selectList(queryWrapper); + // 如果没有任何设备关联记录，直接返回空Map + if (CollectionUtils.isEmpty(equipmentList)) { + return Collections.emptyMap(); + } + // 2. 查询设备详细信息 List equipIds = equipmentList.stream() .map(MeetingRoomEquipmentEntity::getEquipId) .distinct() .collect(Collectors.toList()); + // 如果设备ID列表为空，也直接返回空Map + if (CollectionUtils.isEmpty(equipIds)) { + return Collections.emptyMap(); + } + Map 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; /** * 标签名称