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 @@
专题活动名称:
+
+ 所属栏目:
+
操作人员:
@@ -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 @@
部门动态名称:
+
+ 所属栏目:
+
操作人员:
@@ -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 @@
AND trends_title like concat('%', #{trendsTitle}, '%')
+
+ AND column_name like concat('%', #{columnName}, '%')
+
AND create_by like concat('%', #{createBy}, '%')
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 @@
AND special_title like concat('%', #{specialTitle}, '%')
+
+ AND column_name like concat('%', #{columnName}, '%')
+
AND create_by like concat('%', #{createBy}, '%')