hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-11 03:46:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

searchTags调整

Browse Source
This commit is contained in:
670788339
2025-10-29 16:29:15 +08:00
parent 5d3745680a
commit 448bc0f1e4
1 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagDao.java
View File

@@ -126,10 +126,10 @@ public class CourseTagDao extends BaseDao<CourseTag> {
StringBuilder sql = new StringBuilder();
List<Object> parameters = new ArrayList<>();
sql.append("SELECT id, tag_name ");
// 查询所有必要字段，保持两个UNION查询字段一致
sql.append("SELECT id, tag_name, sys_create_time, is_public, is_hot, last_set_hot_time, deleted, sys_create_aid, sys_update_aid, sys_update_time ");
sql.append("FROM ( ");
// 第一个查询：非公开标签
sql.append(" SELECT id, tag_name, sys_create_time ");
sql.append(" SELECT id, tag_name, sys_create_time, is_public, is_hot, last_set_hot_time, deleted, sys_create_aid, sys_update_aid, sys_update_time ");
sql.append(" FROM boe_course_tag ");
sql.append(" WHERE deleted = 0 AND is_public = 0 ");
@@ -139,8 +139,7 @@ public class CourseTagDao extends BaseDao<CourseTag> {
}
sql.append(" UNION ALL ");
// 第二个查询：公开标签
sql.append(" SELECT t.id, t.tag_name, t.sys_create_time ");
sql.append(" SELECT t.id, t.tag_name, t.sys_create_time, t.is_public, t.is_hot, t.last_set_hot_time, t.deleted, t.sys_create_aid, t.sys_update_aid, t.sys_update_time ");
sql.append(" FROM boe_course_tag_relation r ");
sql.append(" INNER JOIN boe_course_tag t ON r.tag_id = t.id ");
sql.append(" WHERE r.deleted = 0 AND t.deleted = 0 AND t.is_public = 1 ");
@@ -155,13 +154,12 @@ public class CourseTagDao extends BaseDao<CourseTag> {
parameters.add("%" + tagName + "%");
}
sql.append(" GROUP BY t.id, t.tag_name, t.sys_create_time ");
// 保留GROUP BY以避免重复数据，但确保SELECT字段与GROUP BY字段一致
sql.append(" GROUP BY t.id, t.tag_name, t.sys_create_time, t.is_public, t.is_hot, t.last_set_hot_time, t.deleted, t.sys_create_aid, t.sys_update_aid, t.sys_update_time ");
sql.append(") AS all_tags ");
sql.append("ORDER BY ");
// 根据typeId参数决定是否执行特殊排序
if (StringUtils.isNotBlank(typeId)) {
// 第一排序：指定tag_id在前列
sql.append(" CASE WHEN id IN ( ");
sql.append(" SELECT tag_id ");
sql.append(" FROM boe_course_type_tag_relation ");
@@ -169,26 +167,24 @@ public class CourseTagDao extends BaseDao<CourseTag> {
sql.append(" AND (sys_type1 = ? ");
sql.append(" OR sys_type2 = ? ");
sql.append(" OR sys_type3 = ?) ");
sql.append(" GROUP BY tag_id ");
sql.append(" GROUP BY tag_id "); // 内部查询仍需要GROUP BY
sql.append(" ) THEN 0 ELSE 1 END, ");
parameters.add(Long.valueOf(typeId));
parameters.add(Long.valueOf(typeId));
parameters.add(Long.valueOf(typeId));
}
// 第二排序：按创建时间倒序
sql.append(" sys_create_time DESC");
javax.persistence.Query query = entityManager.createNativeQuery(sql.toString(), CourseTag.class);
// 设置所有参数
for (int i = 0; i < parameters.size(); i++) {
query.setParameter(i + 1, parameters.get(i));
}
return query.getResultList();
}
}