From faad52ed329190d35bb8a36b1e51f21002fc1755 Mon Sep 17 00:00:00 2001
From: zzpay <34701892@qq.com>
Date: Thu, 12 Dec 2024 13:23:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reference/core/service/NewsService.java   | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java
index 180f6e6..86c5d5e 100644
--- a/core/src/main/java/com/jinrui/reference/core/service/NewsService.java
+++ b/core/src/main/java/com/jinrui/reference/core/service/NewsService.java
@@ -286,6 +286,7 @@ public class NewsService {
         news.setStatus(2);
         news.setEditorId(editorId);
         newsMapper.publishNews(news);
+        // zzp
         deleteNewsColumnAndTag(newsId);
         try {
             SaveDraftTag saveDraftTag = saveNewsDTO.getTag();
@@ -303,10 +304,6 @@ public class NewsService {
                     }
                 }
 
-//                Long field = saveDraftTag.getField();
-//                if (field != null) {
-//                    tagMapper.saveNewsTagRel(id, field);
-//                }
             }
         } catch (Exception e) {
             log.error("保存发布新闻标签出错!", e);
@@ -454,9 +451,35 @@ public class NewsService {
             }
         }
 
-//        List<News> newList = newsMapper.queryNews(null, null, null, null, "createTime", null, 1, 0);
-//        Long newsId = newList.get(0).getId();
+        List<News> newList = newsMapper.queryNews(null, null, null, null, "createTime", null, 1, 0);
+        Long newsId = newList.get(0).getId();
+        // 保存新闻标签关系
+        try {
+            SaveDraftTag saveDraftTag = saveNewsDTO.getTag();
+            if (saveDraftTag != null) {
+                Long source = saveDraftTag.getSource();
+                if (source != null) {
+                    tagMapper.saveNewsTagRel(newsId, source);
+                }
+                // 频道标签多个，批量插
+                List<Long> fieldArr = saveDraftTag.getFieldArr();
+                if (fieldArr != null) {
+                    for (Long item : fieldArr) {
+                        tagMapper.saveNewsTagRel(newsId, item);
 
+                    }
+                }
+
+//                Long field = saveDraftTag.getField();
+//                if (field != null) {
+//                    tagMapper.saveNewsTagRel(id, field);
+//                }
+            }
+        } catch (Exception e) {
+            log.error("保存发布新闻标签出错!", e);
+            return ResultObject.failed(500, "服务器错误，请联系系统管理员！");
+        }
+        // 保存草稿标签关系
         try {
             SaveDraftTag saveDraftTag = saveNewsDTO.getTag();
             if (saveDraftTag != null) {
@@ -471,11 +494,6 @@ public class NewsService {
 
                     }
                 }
-
-//                Long field = saveDraftTag.getField();
-//                if (field != null) {
-//                    tagMapper.saveDraftTagRel(draftId, field);
-//                }
             }
         } catch (Exception e) {
             log.error("保存草稿标签出错!", e);