Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/ArticleListFormDTO.java

@@ -14,6 +14,16 @@ import java.util.List;
 public class ArticleListFormDTO implements Serializable {
     private static final long serialVersionUID = 6397877545890473794L;
 
+    /**
+     * 栏目
+     */
+    private String category;
+
+    /**
+     * 子栏目列表
+     */
+    private List<String> subCategories;
+
     /**
      * 文章标题
      */

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java

@@ -26,6 +26,11 @@ public class PublishedListResultDTO implements Serializable {
 	 * 分类
 	 */
 	private String category;
+
+	/**
+	 * 栏目名称
+	 */
+	private String categoryName;
 	/**
 	 * 组织Id
 	 */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -131,6 +131,9 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	@Autowired
 	private DraftPublishRangeService draftPublishRangeService;
 
+	@Autowired
+	private CategoryDictDao categoryDictDao;
+
 	@Value("${openapi.scan.server.url}")
 	private String scanApiUrl;
 	@Value("${openapi.scan.method.imgSyncScan}")
@@ -1759,6 +1762,20 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		formDTO.setAgencyId(staffInfo.getAgencyId());
 		//列表查询
 		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+
+		// 查询子栏目
+		String categoryId;
+		List<String> subCategories;
+		if (StringUtils.isNotBlank(categoryId = formDTO.getCategory())) {
+			LambdaQueryWrapper<CategoryDictEntity> cq = new LambdaQueryWrapper<>();
+			cq.eq(CategoryDictEntity::getPid, categoryId);
+			List<CategoryDictEntity> subCtgs = categoryDictDao.selectList(cq);
+			if (! CollectionUtils.isEmpty(subCtgs)) {
+				subCategories = subCtgs.stream().map(CategoryDictEntity::getId).collect(Collectors.toList());
+				formDTO.setSubCategories(subCategories);
+			}
+		}
+
 		List<PublishedListResultDTO> list = baseDao.selectAllArticle(formDTO);
 		PageInfo<PublishedListResultDTO> pageInfo = new PageInfo<>(list);
 
@@ -1821,6 +1838,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			resultDTO.setTagIdList(contentList);
 		}
 
+		// 栏目
+		CategoryDictEntity categoryDict = categoryDictDao.selectById(resultDTO.getCategory());
+		if (categoryDict != null) {
+			resultDTO.setCategoryName(categoryDict.getCategoryName());
+		}
+
 		return resultDTO;
 	}
 

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -456,6 +456,14 @@
         LEFT JOIN article_cover ac ON a.id = ac.article_id AND ac.del_flag = '0'
         WHERE
             a.del_flag = '0'
+        <!-- 栏目 -->
+        <if test="subCategories != null and subCategories.size() > 0">
+          and a.CATEGORY in (
+              <foreach collection="subCategories" item="category" separator=",">
+                  #{category}
+              </foreach>
+            )
+        </if>
         <if test="articleId != null and articleId != '' ">
             AND a.id = #{articleId}
         </if>