From 63ac2809ddded2dbe4bc5de2a2cc5ec7ec3d535b Mon Sep 17 00:00:00 2001
From: wangys <3401275564@qq.com>
Date: Thu, 25 Dec 2025 11:55:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A1=B5=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                                | 3 ++-
 docker/schoolNews/config/application.yml                  | 1 +
 .../src/main/java/org/xyzh/common/vo/TaskItemVO.java      | 8 ++++++++
 .../news/src/main/resources/mapper/ResourceMapper.xml     | 7 +++++--
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index b77068a..a22c164 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,5 @@ docker/dify/nginx/conf.d/default.conf
 docker/dify/nginx/ssl/*
 !docker/dify/nginx/ssl/.gitkeep
 docker/dify/middleware.env
-docker/dify/docker-compose.override.yaml
\ No newline at end of file
+docker/dify/docker-compose.override.yaml
+schoolNewsServ/**/bin
\ No newline at end of file
diff --git a/docker/schoolNews/config/application.yml b/docker/schoolNews/config/application.yml
index fac2594..9deb88d 100644
--- a/docker/schoolNews/config/application.yml
+++ b/docker/schoolNews/config/application.yml
@@ -96,6 +96,7 @@ school-news:
       - "/static/**"
       - "/file/download/**"
       - "/ai/chat/stream/**"
+      - "/system/config/baseinfo"
 
 # 爬虫配置 - Docker环境
 crawler:
diff --git a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java
index bc73c32..e20e1bf 100644
--- a/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java
+++ b/schoolNewsServ/common/common-dto/src/main/java/org/xyzh/common/vo/TaskItemVO.java
@@ -24,6 +24,7 @@ public class TaskItemVO extends TbLearningTask {
     private Integer status;
     private BigDecimal progress;
     private Date completeTime;
+    private String tagID;
     
     // 搜索结果展示字段
     private String coverImage;
@@ -32,6 +33,13 @@ public class TaskItemVO extends TbLearningTask {
     private Integer viewCount;
     private Date publishTime;
 
+    public String getTagID() {
+        return tagID;
+    }
+    public void setTagID(String tagID) {
+        this.tagID = tagID;
+    }
+
     public String getDeptID() {
         return deptID;
     }
diff --git a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml
index ba64ce5..b3677ac 100644
--- a/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml
+++ b/schoolNewsServ/news/src/main/resources/mapper/ResourceMapper.xml
@@ -486,7 +486,8 @@
                 r.summary,
                 r.view_count AS viewCount,
                 r.publish_time AS publishTime,
-                r.create_time AS createTime
+                r.create_time AS createTime,
+                r.tag_id AS tagID
             FROM tb_resource r
             INNER JOIN tb_resource_permission rp ON r.resource_id = rp.resource_id 
                 AND rp.resource_type = 1 
@@ -538,8 +539,10 @@
                 c.description AS summary,
                 c.view_count AS viewCount,
                 NULL AS publishTime,
-                c.create_time AS createTime
+                c.create_time AS createTime,
+                ct.tag_id AS tagID
             FROM tb_course c
+            LEFT JOIN tb_course_tag ct ON c.course_id = ct.course_id AND ct.deleted = 0
             INNER JOIN tb_resource_permission rp ON c.course_id = rp.resource_id 
                 AND rp.resource_type = 2 
                 AND rp.deleted = 0