Merge remote-tracking branch 'origin/main'

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

@@ -233,8 +233,15 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
             roomVoList.stream().forEach(sRoomVo -> {
                 roomIds.add(sRoomVo.getId());
             });
-            List<SRoomPack> roomPacks = roomPackMapper.selectBatchIds(roomIds);
             List<Long> packIds = new ArrayList<>();
+            LambdaQueryWrapper<SRoomPack> roomPackQueryWrapper = new LambdaQueryWrapper();
+            if (roomIds.size() > 0) {
+                roomPackQueryWrapper.in(SRoomPack::getRoomId, roomIds);
+            } else {
+                roomIds.add(0L);
+                roomPackQueryWrapper.in(SRoomPack::getRoomId, roomIds);
+            }
+            List<SRoomPack> roomPacks = roomPackMapper.selectList(roomPackQueryWrapper);
             roomPacks.stream().forEach(sRoomPack -> {
                 packIds.add(sRoomPack.getPackId());
             });