From 7ca4edbafb76568878dfda1d70478fb3ca073762 Mon Sep 17 00:00:00 2001
From: wangxy <1481820854@qq.com>
Date: Thu, 27 Mar 2025 15:11:15 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E4=B8=93=E9=A2=98?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=EF=BC=8C=E5=8A=A8=E6=80=81=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/system/special/special.html | 7 +++++++
 .../main/resources/templates/system/trends/trends.html   | 9 ++++++++-
 .../main/resources/mapper/system/SysDeptTrendsMapper.xml | 3 +++
 .../main/resources/mapper/system/SysSpecialMapper.xml    | 3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/special/special.html b/ruoyi-admin/src/main/resources/templates/system/special/special.html
index e414bd3..29c01e3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/special/special.html
+++ b/ruoyi-admin/src/main/resources/templates/system/special/special.html
@@ -13,6 +13,9 @@
 							<li>
 								专题活动名称：<input type="text" name="specialTitle"/>
 							</li>
+							<li>
+								所属栏目：<input type="text" name="columnName"/>
+							</li>
 							<li>
 								操作人员：<input type="text" name="createBy"/>
 							</li>
@@ -64,6 +67,10 @@
 					field : 'specialTitle',
 					title : '专题活动名称'
 				},
+				{
+					field : 'columnName',
+					title : '所属栏目'
+				},
 				{
 		            field: 'status',
 		            title: '状态',
diff --git a/ruoyi-admin/src/main/resources/templates/system/trends/trends.html b/ruoyi-admin/src/main/resources/templates/system/trends/trends.html
index 35a8637..f5e0ca5 100644
--- a/ruoyi-admin/src/main/resources/templates/system/trends/trends.html
+++ b/ruoyi-admin/src/main/resources/templates/system/trends/trends.html
@@ -13,6 +13,9 @@
 							<li>
 								部门动态名称：<input type="text" name="trendsTitle"/>
 							</li>
+							<li>
+								所属栏目：<input type="text" name="columnName"/>
+							</li>
 							<li>
 								操作人员：<input type="text" name="createBy"/>
 							</li>
@@ -62,7 +65,11 @@
 		        },
 				{
 					field : 'trendsTitle',
-					title : '文章名称'
+					title : '部门动态名称'
+				},
+				{
+					field : 'columnName',
+					title : '所属栏目'
 				},
 				{
 		            field: 'status',
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptTrendsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptTrendsMapper.xml
index 87c3d64..12ee041 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptTrendsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptTrendsMapper.xml
@@ -37,6 +37,9 @@
             <if test="trendsTitle != null and trendsTitle != ''">
                 AND trends_title like concat('%', #{trendsTitle}, '%')
             </if>
+            <if test="columnName != null and columnName != ''">
+                AND column_name like concat('%', #{columnName}, '%')
+            </if>
             <if test="createBy != null and createBy != ''">
                 AND create_by like concat('%', #{createBy}, '%')
             </if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSpecialMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSpecialMapper.xml
index 77ecc4a..a8b73c5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysSpecialMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysSpecialMapper.xml
@@ -38,6 +38,9 @@
             <if test="specialTitle != null and specialTitle != ''">
                 AND special_title like concat('%', #{specialTitle}, '%')
             </if>
+            <if test="columnName != null and columnName != ''">
+                AND column_name like concat('%', #{columnName}, '%')
+            </if>
             <if test="createBy != null and createBy != ''">
                 AND create_by like concat('%', #{createBy}, '%')
             </if>