|
@@ -120,8 +120,10 @@ public class ShopWarehouseServiceImpl extends SysServiceImpl<ShopWarehouseMapper
|
|
|
|
|
|
// 将国家信息和用户角色信息放入对应的仓库列表项中
|
|
|
for (ShopWarehouseVo warehouseVo : warehouseList) {
|
|
|
+ if (warehouseVo.getMap() == null) {
|
|
|
+ warehouseVo.setMap(new HashMap<>()); // 确保 map 被初始化
|
|
|
+ }
|
|
|
if (baseCountryServeVoMap.containsKey(warehouseVo.getCountryServeId())) {
|
|
|
- warehouseVo.setMap(new HashMap<>()); // 初始化 map
|
|
|
warehouseVo.getMap().put("countryServe", baseCountryServeVoMap.get(warehouseVo.getCountryServeId()));
|
|
|
}
|
|
|
if (staffMap.containsKey(warehouseVo.getId())) {
|