From 54dcf0a82e7490fa58b1c056d5c0b9cb739c2931 Mon Sep 17 00:00:00 2001
From: zjk <852185829@qq.com>
Date: 星期二, 29 九月 2026 14:34:32 +0800
Subject: [PATCH] build(traditionalApp): 更新版本名至1.0.49,版本号至149

---
 tcm-training-admin-backend/src/main/java/com/tcm/training/admin/live/service/HealthPopularizationAppService.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/live/service/HealthPopularizationAppService.java b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/live/service/HealthPopularizationAppService.java
index d2ac474..9d287aa 100644
--- a/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/live/service/HealthPopularizationAppService.java
+++ b/tcm-training-admin-backend/src/main/java/com/tcm/training/admin/live/service/HealthPopularizationAppService.java
@@ -31,7 +31,7 @@
                                                              Integer status) {
         LambdaQueryWrapper<HealthPopularization> qw = new LambdaQueryWrapper<HealthPopularization>()
                 .eq(HealthPopularization::getDeleted, 0)
-                .orderByAsc(HealthPopularization::getSort)
+                .orderByDesc(HealthPopularization::getSort)
                 .orderByDesc(HealthPopularization::getId);
         String trimmedKeyword = trimToNull(keyword);
         if (trimmedKeyword != null) {
@@ -56,7 +56,7 @@
         return toDetailVO(requireItem(id));
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public HealthPopularizationDetailVO create(HealthPopularizationSaveRequest req) {
         HealthPopularization item = new HealthPopularization();
         fillEntity(item, req);
@@ -66,7 +66,7 @@
         return detail(item.getId());
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public HealthPopularizationDetailVO update(Long id, HealthPopularizationSaveRequest req) {
         HealthPopularization item = requireItem(id);
         fillEntity(item, req);
@@ -74,7 +74,7 @@
         return detail(id);
     }
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void delete(Long id) {
         requireItem(id);
         healthPopularizationMapper.deleteById(id);
@@ -96,6 +96,7 @@
             item.setContent(content);
             item.setVideoUrl(null);
             item.setVideoFileName(null);
+            item.setVideoDescription(null);
             return;
         }
 
@@ -106,6 +107,7 @@
         item.setContent(null);
         item.setVideoUrl(videoUrl);
         item.setVideoFileName(trimToNull(req.getVideoFileName()));
+        item.setVideoDescription(trimToNull(req.getVideoDescription()));
     }
 
     private int validateContentType(Integer contentType) {
@@ -153,6 +155,7 @@
         vo.setContent(item.getContent());
         vo.setVideoUrl(item.getVideoUrl());
         vo.setVideoFileName(item.getVideoFileName());
+        vo.setVideoDescription(item.getVideoDescription());
         vo.setStatus(item.getStatus());
         vo.setIsHomeRecommend(item.getIsHomeRecommend());
         vo.setClickCount(defaultNumber(item.getClickCount()));

--
Gitblit v1.7.1