Merge branch 'feature-wm' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -38,6 +38,7 @@ import com.gic.haoban.manage.web.qo.content.*;
 import com.gic.haoban.manage.web.qo.content.like.ContentMaterialLikeQO;
 import com.gic.haoban.manage.web.vo.content.*;
 import com.gic.haoban.manage.web.vo.content.statistics.ContentMaterialKnowVO;
+import com.gic.store.goods.enums.ThirdTypeEnum;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -169,6 +170,7 @@ public class ContentMaterialController {
         List<String> goodsIds = responseResult.getResult()
                 .stream()
                 .filter(item -> CollectionUtils.isNotEmpty(item.getContentGoodsList()))
+                .filter(item -> ThirdTypeEnum.GIC.getCode().equals(item.getContentGoodsList().get(0).getThirdType()))
                 .map(item -> item.getContentGoodsList().get(0).getGoodsId())
                 .distinct()
                 .collect(Collectors.toList());