素材列表fix

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanMaterialMapper.java

@@ -26,6 +26,8 @@ public interface TabHaobanMaterialMapper {
 
 	Page<TabHaobanMaterial> listMaterial(@Param("wxEnterpriseId")String wxEnterpriseId, @Param("keyword")String keyword, @Param("categoryId")String categoryId, @Param("materialType")Integer materialType);
 
+    Page<TabHaobanMaterial> listMaterialByCategoryIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("keyword") String keyword, @Param("categoryIds") List<String> categoryIds, @Param("materialType") Integer materialType);
+
     TabHaobanMaterial selectByfromMaterialId(@Param("fromMaterialId") String fromMaterialId, @Param("wxEnterpriseId") String wxEnterpriseId);
 
     List<TabHaobanMaterial> listByfromMaterialId(@Param("fromMaterialId") String fromMaterialId);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/MaterialService.java

@@ -19,6 +19,18 @@ public interface MaterialService {
 	com.github.pagehelper.Page listMaterial(String wxEnterpriseId, String keyword, String categoryId,
 											Integer materialType);
 
+	/**
+	 * 查询素材
+	 *
+	 * @param wxEnterpriseId
+	 * @param keyword
+	 * @param categoryId
+	 * @param materialType
+	 * @return
+	 */
+	com.github.pagehelper.Page listMaterial(String wxEnterpriseId, String keyword, List<String> categoryId,
+											Integer materialType);
+
     MaterialDTO getMaterialByFromMaterialId(String fromMaterialId, String wxEnterpriseId);
 
     /**

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/MaterialServiceImpl.java

@@ -65,6 +65,11 @@ public class MaterialServiceImpl implements MaterialService {
 	}
 
 	@Override
+	public Page<TabHaobanMaterial> listMaterial(String wxEnterpriseId, String keyword, List<String> categoryIds, Integer materialType) {
+		return mapper.listMaterialByCategoryIds(wxEnterpriseId, keyword, categoryIds, materialType);
+	}
+
+	@Override
 	public MaterialDTO getMaterialByFromMaterialId(String fromMaterialId, String wxEnterpriseId) {
         TabHaobanMaterial tabHaobanMaterial = mapper.selectByfromMaterialId(fromMaterialId, wxEnterpriseId);
         return EntityUtil.changeEntityByJSON(MaterialDTO.class, tabHaobanMaterial);

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MaterialApiServiceImpl.java

@@ -2,10 +2,7 @@ package com.gic.haoban.manage.service.service.out.impl;
 
 import java.io.InputStream;
 import java.net.URL;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.gic.haoban.base.api.common.ServiceResponse;
@@ -266,11 +263,28 @@ public class MaterialApiServiceImpl implements MaterialApiService {
 		return old.getMediaId();
 	}
 
+	private List<String> listSubCategoryIdsByParentId(String categoryId) {
+		List<String> categoryIds = new ArrayList<>();
+		categoryIds.add(categoryId);
+		if (StringUtils.isBlank(categoryId)) {
+			return categoryIds;
+		}
+		List<MaterialCategoryDTO> categoryDTOList = materialCategoryService.listByParentCategory(categoryId);
+		if (CollectionUtils.isEmpty(categoryDTOList)) {
+			return categoryIds;
+		}
+		for (MaterialCategoryDTO categoryDTO : categoryDTOList) {
+			categoryIds.addAll(this.listSubCategoryIdsByParentId(categoryDTO.getCategoryId()));
+		}
+		return categoryIds;
+	}
+
 	@Override
 	public Page<MaterialDTO> listMaterial(String wxEnterpriseId, String keyword, String categoryId,
 			Integer materialType,BasePageInfo pageInfo) {
 		PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-		com.github.pagehelper.Page<TabHaobanMaterial> page = materialService.listMaterial(wxEnterpriseId,keyword,categoryId,materialType);
+		List<String> categoryIds = this.listSubCategoryIdsByParentId(categoryId);
+		com.github.pagehelper.Page<TabHaobanMaterial> page = materialService.listMaterial(wxEnterpriseId, keyword, categoryIds, materialType);
 		List<TabHaobanMaterial> result = page.getResult();
         List<TabMiniprogramSetting> settings = miniprogramSettingService.listMiniprogram(wxEnterpriseId);
         if (CollectionUtils.isNotEmpty(result) && CollectionUtils.isNotEmpty(settings)) {

haoban-manage3-service/src/main/resources/mapper/TabHaobanMaterialMapper.xml

@@ -279,6 +279,28 @@
     order by update_time desc
   </select>
 
+  <select id="listMaterialByCategoryIds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from tab_haoban_material
+    where status_flag = 1
+    and wx_enterprise_id = #{wxEnterpriseId}
+    <if test="keyword != null and keyword != ''">
+      and material_title like CONCAT('%',#{keyword},'%')
+    </if>
+    <if test="materialType != null">
+      and material_type = #{materialType}
+    </if>
+    <if test="categoryIds != null and categoryIds.size>0">
+      and category_id in
+      <foreach collection="categoryIds" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+
+    order by update_time desc
+  </select>
+
   <select id="selectByfromMaterialId" resultMap="BaseResultMap" parameterType="java.lang.String">
     select
     <include refid="Base_Column_List"/>