Merge branch 'dev' into test

share-system/src/main/java/share/system/service/impl/RoomPackServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.util.CollectionUtils;
 import share.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -114,6 +115,9 @@ public class RoomPackServiceImpl extends ServiceImpl<RoomPackMapper, SRoomPack>
         queryWrapper.eq(SRoomPack::getPackId, id);
         List<SRoomPack> sRoomPackList = baseMapper.selectList(queryWrapper);
         List<Long> roomIds = sRoomPackList.stream().map(SRoomPack::getRoomId).collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(roomIds)) {
+            return sRoomPackList;
+        }
         List<SRoom> sRoomList = sRoomMapper.selectList(new LambdaQueryWrapper<SRoom>().in(SRoom::getId, roomIds));
         sRoomPackList.forEach(item -> {
             if (ObjectUtils.isNotEmpty(item.getRoomId())) {