Merge remote-tracking branch 'origin/main'

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

@@ -242,9 +242,11 @@ public class SStoreServiceImpl extends ServiceImpl<SStoreMapper, SStore> impleme
             });
             List<SPack> packs = packService.selectPackListByIds(packIds);
             Map<Long,SPack> map = new HashMap<>();
-            packs.stream().forEach(sPack -> {
-                map.put(sPack.getId(), sPack);
-            });
+            if (packs != null) {
+                packs.stream().forEach(sPack -> {
+                    map.put(sPack.getId(), sPack);
+                });
+            }
             roomVoList.stream().forEach(sRoomVo -> {
                 List<SPack> sPacks = new ArrayList<>();
                 roomPacks.stream().forEach(sRoomPack -> {