From fbfb5bfc62ea0f68c647f9d5cb3b808eb483a563 Mon Sep 17 00:00:00 2001
From: zzp <34701892@qq.com>
Date: Wed, 11 Dec 2024 18:13:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=96=87=E7=AB=A0=E6=97=B6?=
 =?UTF-8?q?=E6=96=B0=E9=97=BBid=E6=B2=A1=E6=9C=89=E5=92=8C=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reference/core/service/NewsService.java   | 29 ++++++++++++-------
 1 file changed, 18 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 691a331..e2f3b84 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
@@ -155,7 +155,7 @@ public class NewsService {
                     NewsDetailTagItem tagItem = new NewsDetailTagItem();
                     tagItem.setId(tagId);
                     tagItem.setName(tag.getName());
-                    if (parentId!=null && parentId == 1) {
+                    if (parentId != null && parentId == 1) {
                         newsDetailTag.setSource(tagItem);
                     } else {
                         newsDetailTag.setField(tagItem);
@@ -239,6 +239,16 @@ public class NewsService {
             }
         }
 
+        // 发布时创建文章
+        if (id == null) {
+            // 已发布
+            saveNewsDTO.setStatus(2);
+            saveNewsDTO.setPublishTime(new Date());
+            saveNewDraft(saveNewsDTO, null);
+            newsId = newsMapper.getLastInsertId();
+
+        }
+
         news = new News(saveNewsDTO);
         news.setStatus(2);
         news.setEditorId(editorId);
@@ -266,7 +276,7 @@ public class NewsService {
             if (column != null) {
                 SaveDraftColumnVip vip = column.getVip();
                 if (vip != null) {
-                  Long  vipId = vip.getId();
+                    Long vipId = vip.getId();
                     if (vipId != null) {
                         Integer type = vip.getType();
                         columnMapper.saveNewsColumnRel(newsId, vipId, type);
@@ -277,12 +287,16 @@ public class NewsService {
                     Boolean show = earlyKnow.getShow();
                     if (show != null && show) {
                         Integer type = earlyKnow.getType();
-                        columnMapper.saveNewsColumnRel(newsId, 13L, type);
+                        columnMapper.saveNewsColumnRel(newsId, 13L, null);
                     }
                 }
                 Boolean showEverything = column.getShowEverything();
+                Integer type = null;
+                if (earlyKnow != null) {
+                     type = earlyKnow.getType();//时间紧，暂时把早知道的type挪过来
+                }
                 if (showEverything != null && showEverything) {
-                    columnMapper.saveNewsColumnRel(newsId, 14L, null);
+                    columnMapper.saveNewsColumnRel(newsId, 14L, type);
                 }
             }
         } catch (Exception e) {
@@ -290,13 +304,6 @@ public class NewsService {
             return ResultObject.failed(500, "服务器错误，请联系系统管理员！");
         }
 
-        // 发布时创建文章
-        if (id == null) {
-            // 已发布
-            saveNewsDTO.setStatus(2);
-            saveNewsDTO.setPublishTime(new Date());
-            saveNewDraft(saveNewsDTO,null);
-        }
 
         return ResultObject.success();
     }