From dabe5e677eb6bb15c806bdc968b1d16455d7ab7f Mon Sep 17 00:00:00 2001
From: "rong.liu" <liurong@huorantech.cn>
Date: Wed, 15 Mar 2023 16:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../huoran/iasf/mapper/xml/SysContentMapper.xml    |  3 ++-
 .../iasf/service/impl/SysContentServiceImpl.java   | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
index 7fa0445..c29559e 100644
--- a/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
+++ b/src/main/java/com/huoran/iasf/mapper/xml/SysContentMapper.xml
@@ -185,7 +185,8 @@
                 AND is_release = 1) t
         WHERE FIND_IN_SET(t.column_id, #{columnId})
 
-        ORDER BY t.release_time DESC
+        ORDER BY
+            t.sequence ASC
     </select>
 
    <!-- &lt;!&ndash;根据 sequence 查询下一条记录主键&ndash;&gt;
diff --git a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
index 25cbc2d..5f2b9ed 100644
--- a/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
+++ b/src/main/java/com/huoran/iasf/service/impl/SysContentServiceImpl.java
@@ -159,7 +159,17 @@ public class SysContentServiceImpl extends ServiceImpl<SysContentMapper, SysCont
         //获取当前文章所属栏目id
         Integer columnId = content.getColumnId();
 
-        if (currentSerialNumber.equals(sequenceNumber)){
+        //获取栏目下全部文章的数量与当前输入的序号判断 如果要更改的序号大于当前有的数量，直接替换
+        QueryWrapper<SysContent> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("column_id", columnId);
+        queryWrapper.eq("deleted", 1);
+        List<SysContent> contentList = baseMapper.selectList(queryWrapper);
+        if (sequenceNumber >= contentList.size()) {
+            sequenceNumber = contentList.size();
+        }
+
+
+        if (currentSerialNumber.equals(sequenceNumber)) {
             return R.success();
         }
 
@@ -178,7 +188,7 @@ public class SysContentServiceImpl extends ServiceImpl<SysContentMapper, SysCont
         if (currentSerialNumber > sequenceNumber) {
             //改大 gt >
             updateWrapper1.setSql("  sequence = sequence + 1");
-            updateWrapper1.last(" and sequence >= "+sequenceNumber+ " and sequence < "+currentSerialNumber);
+            updateWrapper1.last(" and sequence >= " + sequenceNumber + " and sequence < " + currentSerialNumber);
         } else if (currentSerialNumber < sequenceNumber) {
             //改小
             updateWrapper1.le("sequence", sequenceNumber);