mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-06 17:36:47 +08:00
排序调整
This commit is contained in:
@@ -129,32 +129,27 @@ public class CourseTagDao extends BaseDao<CourseTag> {
|
||||
// 只查询实际存在的字段
|
||||
sql.append("SELECT id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time ");
|
||||
sql.append("FROM ( ");
|
||||
sql.append(" SELECT id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time,sys_update_time ");
|
||||
sql.append(" FROM boe_course_tag ");
|
||||
sql.append(" WHERE deleted = 0 AND is_public = 1 AND status = 0 ");
|
||||
|
||||
if (StringUtils.isNotBlank(tagName)) {
|
||||
sql.append(" AND tag_name LIKE ? ");
|
||||
parameters.add("%" + tagName + "%");
|
||||
}
|
||||
|
||||
sql.append(" UNION ALL ");
|
||||
sql.append(" SELECT t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time,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 = 0 AND t.status = 0 ");
|
||||
|
||||
if (StringUtils.isNotBlank(userId)) {
|
||||
sql.append(" AND r.sys_create_aid = ? ");
|
||||
parameters.add(Long.valueOf(userId));
|
||||
}
|
||||
|
||||
if (StringUtils.isNotBlank(tagName)) {
|
||||
sql.append(" AND t.tag_name LIKE ? ");
|
||||
parameters.add("%" + tagName + "%");
|
||||
}
|
||||
|
||||
sql.append(" GROUP BY t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time,t.sys_update_time ");
|
||||
sql.append(" UNION ALL ");
|
||||
sql.append(" SELECT id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time,sys_update_time ");
|
||||
sql.append(" FROM boe_course_tag ");
|
||||
sql.append(" WHERE deleted = 0 AND is_public = 1 AND status = 0 ");
|
||||
if (StringUtils.isNotBlank(tagName)) {
|
||||
sql.append(" AND tag_name LIKE ? ");
|
||||
parameters.add("%" + tagName + "%");
|
||||
}
|
||||
sql.append(") AS all_tags ");
|
||||
sql.append("ORDER BY ");
|
||||
|
||||
@@ -167,7 +162,7 @@ public class CourseTagDao extends BaseDao<CourseTag> {
|
||||
sql.append(" OR sys_type2 = ? ");
|
||||
sql.append(" OR sys_type3 = ?) ");
|
||||
sql.append(" GROUP BY tag_id ");
|
||||
sql.append(" ) THEN 0 ELSE 1 END, ");
|
||||
sql.append(" ) THEN 0 ELSE 1 END ");
|
||||
parameters.add(Long.valueOf(typeId));
|
||||
parameters.add(Long.valueOf(typeId));
|
||||
parameters.add(Long.valueOf(typeId));
|
||||
|
||||
Reference in New Issue
Block a user