搜索页修复

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;
     }

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