From a27d3c2343846103c5540f526c3c2f38b85352e1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 11 Jul 2022 11:50:43 +0800
Subject: [PATCH] fix

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java |    2 +-
 src/test/java/com/xcong/farmer/cms/ArticleTest.java                                    |    8 ++------
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java |    2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
index 6fb640a..bd7fa78 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ArticleServiceImpl.java
@@ -182,7 +182,7 @@
             return Result.fail("请选择文章栏目");
         }
 
-        if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == null) {
+        if (!articleEntity.getColumnId().equals(columnId) && articleEntity.getBeforeColumnId() == -1) {
             articleEntity.setBeforeColumnId(articleEntity.getColumnId());
         }
         articleEntity.setColumnId(columnId);
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
index d0ca9e8..91d040d 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ReleaseServiceImpl.java
@@ -47,7 +47,7 @@
         ColumnEntity column = columnMapper.selectById(article.getColumnId());
 
         Long beforeColumnId = article.getBeforeColumnId();
-        article.setBeforeColumnId(null);
+        article.setBeforeColumnId(-1L);
         articleMapper.updateById(article);
 
         Map<String, Object> data = new Hashtable<>();
diff --git a/src/test/java/com/xcong/farmer/cms/ArticleTest.java b/src/test/java/com/xcong/farmer/cms/ArticleTest.java
index 6bd10ae..12778d0 100644
--- a/src/test/java/com/xcong/farmer/cms/ArticleTest.java
+++ b/src/test/java/com/xcong/farmer/cms/ArticleTest.java
@@ -21,12 +21,8 @@
         Long columnId = 83L;
         ArticleEntity article = articleMapper.selectById(88L);
 
-        System.out.println(!article.getColumnId().equals(columnId));
-        if (!article.getColumnId().equals(columnId) && article.getBeforeColumnId() == null) {
-            article.setBeforeColumnId(article.getColumnId());
-        }
-
-        System.out.println(1);
+        article.setBeforeColumnId(-1L);
+        articleMapper.updateById(article);
     }
 
 }

--
Gitblit v1.9.1