关注商品列表查询2

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SpecialPerformanceServiceImpl.java

@@ -292,13 +292,7 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                     .collect(Collectors.toMap(SpecialPerformanceItemFollow::getItemId, Function.identity(), (k1, k2) -> k2));
 
             SpecialPerformanceConfigRequestDto specialPerformanceConfigRequestDto = new SpecialPerformanceConfigRequestDto();
-            if (dto.getSearchType() != null && dto.getSearchType() == 1) {
-                if (!CollectionUtils.isEmpty(followItemList)) {
-                    specialPerformanceConfigRequestDto.setItemIdList(followItemList);
-                } else {
-                    return Result.failed("没有关注商品");
-                }
-            }
+
 
             //判断是否有查询条件
             if (StringUtils.hasLength(dto.getSearchParam())) {
@@ -333,8 +327,17 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
             if (!CollectionUtils.isEmpty(filterItemIdList)) {
                 specialPerformanceConfigRequestDto.setFilterItemIdList(filterItemIdList);
             }
-            List<SpecialPerformanceConfig> list = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
-            PageInfo<SpecialPerformanceConfig> pageInfo = new PageInfo(list);
+            List<SpecialPerformanceConfig> list = new ArrayList<>();
+            PageInfo<SpecialPerformanceConfig> pageInfo = null;
+            if (dto.getSearchType() != null && dto.getSearchType() == 1) {
+                if (!CollectionUtils.isEmpty(followItemList)) {
+                    specialPerformanceConfigRequestDto.setItemIdList(followItemList);
+                    list = specialPerformanceConfigDao.findList(specialPerformanceConfigRequestDto);
+                    pageInfo = new PageInfo(list);
+                } else {
+                    resultMap.put("dataList", null);
+                }
+            }
 
             resultMap.put("backgroundImage", specialPerformance.getBackgroundImage());
             //商品总数
@@ -416,7 +419,9 @@ public class SpecialPerformanceServiceImpl implements SpecialPerformanceService
                 }
                 supplierItemVos.add(supplierItemVo);
             }
-            resultMap.put("dataList", PageSearchResult.of(pageInfo, supplierItemVos));
+            if (!resultMap.containsKey("dataList")) {
+                resultMap.put("dataList", PageSearchResult.of(pageInfo, supplierItemVos));
+            }
             resultMap.put("startTime", specialPerformance.getStartTime());
             resultMap.put("endTime", specialPerformance.getEndTime());
             resultMap.put("title", specialPerformance.getTitle());