搜索页修复
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -36,3 +36,4 @@ docker/dify/nginx/ssl/*
|
|||||||
!docker/dify/nginx/ssl/.gitkeep
|
!docker/dify/nginx/ssl/.gitkeep
|
||||||
docker/dify/middleware.env
|
docker/dify/middleware.env
|
||||||
docker/dify/docker-compose.override.yaml
|
docker/dify/docker-compose.override.yaml
|
||||||
|
schoolNewsServ/**/bin
|
||||||
@@ -96,6 +96,7 @@ school-news:
|
|||||||
- "/static/**"
|
- "/static/**"
|
||||||
- "/file/download/**"
|
- "/file/download/**"
|
||||||
- "/ai/chat/stream/**"
|
- "/ai/chat/stream/**"
|
||||||
|
- "/system/config/baseinfo"
|
||||||
|
|
||||||
# 爬虫配置 - Docker环境
|
# 爬虫配置 - Docker环境
|
||||||
crawler:
|
crawler:
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ public class TaskItemVO extends TbLearningTask {
|
|||||||
private Integer status;
|
private Integer status;
|
||||||
private BigDecimal progress;
|
private BigDecimal progress;
|
||||||
private Date completeTime;
|
private Date completeTime;
|
||||||
|
private String tagID;
|
||||||
|
|
||||||
// 搜索结果展示字段
|
// 搜索结果展示字段
|
||||||
private String coverImage;
|
private String coverImage;
|
||||||
@@ -32,6 +33,13 @@ public class TaskItemVO extends TbLearningTask {
|
|||||||
private Integer viewCount;
|
private Integer viewCount;
|
||||||
private Date publishTime;
|
private Date publishTime;
|
||||||
|
|
||||||
|
public String getTagID() {
|
||||||
|
return tagID;
|
||||||
|
}
|
||||||
|
public void setTagID(String tagID) {
|
||||||
|
this.tagID = tagID;
|
||||||
|
}
|
||||||
|
|
||||||
public String getDeptID() {
|
public String getDeptID() {
|
||||||
return deptID;
|
return deptID;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -486,7 +486,8 @@
|
|||||||
r.summary,
|
r.summary,
|
||||||
r.view_count AS viewCount,
|
r.view_count AS viewCount,
|
||||||
r.publish_time AS publishTime,
|
r.publish_time AS publishTime,
|
||||||
r.create_time AS createTime
|
r.create_time AS createTime,
|
||||||
|
r.tag_id AS tagID
|
||||||
FROM tb_resource r
|
FROM tb_resource r
|
||||||
INNER JOIN tb_resource_permission rp ON r.resource_id = rp.resource_id
|
INNER JOIN tb_resource_permission rp ON r.resource_id = rp.resource_id
|
||||||
AND rp.resource_type = 1
|
AND rp.resource_type = 1
|
||||||
@@ -538,8 +539,10 @@
|
|||||||
c.description AS summary,
|
c.description AS summary,
|
||||||
c.view_count AS viewCount,
|
c.view_count AS viewCount,
|
||||||
NULL AS publishTime,
|
NULL AS publishTime,
|
||||||
c.create_time AS createTime
|
c.create_time AS createTime,
|
||||||
|
ct.tag_id AS tagID
|
||||||
FROM tb_course c
|
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
|
INNER JOIN tb_resource_permission rp ON c.course_id = rp.resource_id
|
||||||
AND rp.resource_type = 2
|
AND rp.resource_type = 2
|
||||||
AND rp.deleted = 0
|
AND rp.deleted = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user