Merge branch 'feature-content-pro' into 'master'

过滤无素材栏目

See merge request !642

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

@@ -8,6 +8,7 @@ import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.content.api.dto.column.ContentColumnListDTO;
 import com.gic.content.api.dto.material.ContentMaterialFrontDTO;
 import com.gic.content.api.dto.material.ContentMaterialShareInfoDTO;
+import com.gic.content.api.enums.ColumnEnum;
 import com.gic.content.api.qdto.material.ContentMaterialPageFrontQDTO;
 import com.gic.content.api.qdto.material.ContentMaterialShareQDTO;
 import com.gic.content.api.service.ContentColumnApiService;
@@ -68,8 +69,16 @@ public class ContentMaterialController {
      * @return
      */
     @RequestMapping(path = "/column-list")
-    public RestResponse<List<ContentColumnInfoVO>> queryContentColumn(String enterpriseId){
-        ServiceResponse<List<ContentColumnListDTO>> serviceResponse = contentColumnApiService.listColumn(enterpriseId, 1);
+    public RestResponse<List<ContentColumnInfoVO>> queryContentColumn(String enterpriseId,String storeId,String wxEnterpriseId,String clerkId){
+        List<String> storeIdList = new ArrayList<>();
+        if (StringUtils.isBlank(storeId)){
+            // 区经 获取管辖的权限
+            List<String> storeIds = this.queryClerkStoreIds(clerkId, wxEnterpriseId);
+            storeIdList.addAll(storeIds);
+        }else {
+            storeIdList.add(storeId);
+        }
+        ServiceResponse<List<ContentColumnListDTO>> serviceResponse = contentColumnApiService.listColumnFront(enterpriseId, ColumnEnum.MATERIAL.value, storeIdList);
         if (!serviceResponse.isSuccess() || CollectionUtils.isEmpty(serviceResponse.getResult())){
             return RestResponse.successResult(Collections.emptyList());
         }