From c07bdfd6c7c43f5cfb1893989a902cf00c1c52f8 Mon Sep 17 00:00:00 2001
From: xpecya <xpecya@gmail.com>
Date: Thu, 12 Dec 2024 20:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=8F=E7=9B=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jinrui/reference/core/mapper/NewsMapper.java |  4 ++--
 .../jinrui/reference/core/service/NewsService.java   | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
index 8b086bb..3bbfe25 100644
--- a/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
+++ b/core/src/main/java/com/jinrui/reference/core/mapper/NewsMapper.java
@@ -95,7 +95,7 @@ public interface NewsMapper {
             "news.title like concat('%', #{keyword}, '%') " +
             "</if>" +
             "<if test=\"column != null\">" +
-            "and news_column_rel.column_id in (#{column}) " +
+            "and news_column_rel.column_id in (${column}) " +
             "</if>" +
             "<if test=\"status != null\">" +
             "and news.status = #{status} " +
@@ -129,7 +129,7 @@ public interface NewsMapper {
             "news.title like concat('%', #{keyword}, '%') " +
             "</if>" +
             "<if test=\"column != null\">" +
-            "and news_column_rel.column_id in (#{column}) " +
+            "and news_column_rel.column_id in (${column}) " +
             "</if>" +
             "<if test=\"status != null\">" +
             "and news.status = #{status} " +
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 a66fae9..f8dbf98 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
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -546,6 +547,17 @@ public class NewsService {
             offset = (Math.max(0, page - current)) * size;
         }
 
+        if (StringUtils.hasText(columnParam)) {
+            String[] split = columnParam.split(",");
+            for (String item : split) {
+                try {
+                    Integer.parseInt(item);
+                } catch (NumberFormatException e) {
+                    return PageObject.failedPage(400, "栏目列表ID异常! column = " + columnParam);
+                }
+            }
+        }
+
         List<News> newsList;
         try {
             newsList = newsMapper.queryNews(keyword, columnParam, status, last, orderBy, direction, size, offset);