1

src/main/java/com/cdf/httpClient/request/FdkkHotData.java

@@ -15,5 +15,5 @@ public class FdkkHotData {
     private String hotContent;
 
     private Integer productSourceId;
-    private Integer brandId;
+    private String brandId;
 }

src/main/java/com/cdf/service/IBrandService.java

@@ -23,7 +23,7 @@ public interface IBrandService extends IService<Brand> {
 
     Object pageList(BrandApiParam param);
 
-    HashMap<String, BrandApiVo> getMapByIds(Set<Integer> brandIds);
+    HashMap<String, BrandApiVo> getMapByIds(Set<String> brandIds);
 
     List<Brand> getByCdfBrandIds(List<String> brandIds);
 

src/main/java/com/cdf/service/impl/BrandServiceImpl.java

@@ -127,7 +127,7 @@ public class BrandServiceImpl extends ServiceImpl<IBrandMapper, Brand> implement
     }
 
     @Override
-    public HashMap<String, BrandApiVo> getMapByIds(Set<Integer> brandIds) {
+    public HashMap<String, BrandApiVo> getMapByIds(Set<String> brandIds) {
         HashMap<String, BrandApiVo> map = new HashMap<>();
         if(!brandIds.isEmpty()){
             List<Brand> brands = this.listByIds(brandIds);

src/main/java/com/cdf/service/impl/FdkkSceneEditService.java

@@ -309,7 +309,7 @@ public class FdkkSceneEditService {
                     productSourceMap.put(productSource.getId(),productSource);
                 }
             }
-            Set<Integer> brandIds = hotRelations.stream().map(HotRelation::getBrandId).filter(brandId -> brandId != null).collect(Collectors.toSet());
+            Set<String> brandIds = hotRelations.stream().map(HotRelation::getBrandId).filter(StringUtils::isNotBlank).collect(Collectors.toSet());
             brandMap = brandService.getMapByIds(brandIds);
         }