From 87c4b63ce203f0fb34241eda92caeccbaceb7f54 Mon Sep 17 00:00:00 2001
From: quling <377956897@qq.com>
Date: 星期六, 22 八月 2026 15:11:01 +0800
Subject: [PATCH] feat0806: APP养生科普健康知识功能改造

---
 tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/popularization/service/AppHealthPopularizationService.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/popularization/service/AppHealthPopularizationService.java b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/popularization/service/AppHealthPopularizationService.java
index f4436bf..d6b6597 100644
--- a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/popularization/service/AppHealthPopularizationService.java
+++ b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/app/popularization/service/AppHealthPopularizationService.java
@@ -30,12 +30,15 @@
 
     /**
      * 获取 APP 健康科普列表页数据。
+     *
+     * @param contentType 内容类型:1 健康知识、2 养生科普;为空则返回全部。
      */
-    public List<AppHealthPopularizationListItemVO> list() {
+    public List<AppHealthPopularizationListItemVO> list(Integer contentType) {
         List<HealthPopularization> items = healthPopularizationMapper.selectList(new LambdaQueryWrapper<HealthPopularization>()
                 .eq(HealthPopularization::getDeleted, 0)
                 .eq(HealthPopularization::getStatus, STATUS_ENABLED)
-                .orderByAsc(HealthPopularization::getSort)
+                .eq(contentType != null, HealthPopularization::getContentType, contentType)
+                .orderByDesc(HealthPopularization::getSort)
                 .orderByDesc(HealthPopularization::getId));
         if (items == null || items.isEmpty()) {
             return Collections.emptyList();
@@ -68,6 +71,7 @@
         detailVO.setContent(trimToEmpty(item.getContent()));
         detailVO.setVideoUrl(trimToEmpty(item.getVideoUrl()));
         detailVO.setVideoFileName(trimToEmpty(item.getVideoFileName()));
+        detailVO.setVideoDescription(trimToEmpty(item.getVideoDescription()));
         return detailVO;
     }
 

--
Gitblit v1.7.1