diff --git a/api/article.go b/api/article.go
index 03140cb..5fbf4f7 100644
--- a/api/article.go
+++ b/api/article.go
@@ -190,14 +190,12 @@ var ArticleItems = &graphql.Field{
 		// 字段选择
 		var user_id = p.Context.Value("user_id").(int)
 		var fields = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
-		var praise, praise_join, collect, collect_join, text_count string
+		var praise, collect, text_count string
 		if funk.Contains(fields, "praise") {
-			praise = ",CASE WHEN web_praise.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_praise"
-			praise_join = fmt.Sprintf("LEFT JOIN web_praise ON web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0", user_id)
+			praise = fmt.Sprintf(",CASE WHEN EXISTS (SELECT 1 FROM web_praise WHERE web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0) THEN TRUE ELSE FALSE END AS is_praise", user_id)
 		}
 		if funk.Contains(fields, "collect") {
-			collect = ",CASE WHEN web_collect.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_collect"
-			collect_join = fmt.Sprintf("LEFT JOIN web_collect ON web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0", user_id)
+			collect = fmt.Sprintf(",CASE WHEN EXISTS (SELECT 1 FROM web_collect WHERE web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0) THEN TRUE ELSE FALSE END AS is_collect", user_id)
 		}
 		if funk.Contains(fields, "text_count") {
 			text_count = ",(SELECT COUNT(*) FROM web_images wi WHERE wi.article_id = web_article.id AND wi.text != '') AS text_count"
@@ -206,9 +204,9 @@ var ArticleItems = &graphql.Field{
 		WITH RankedArticles AS (%s)
 		SELECT * %s %s %s FROM web_article INNER JOIN(
 			SELECT id, row_num FROM RankedArticles %s
-		) AS LimitedRanked ON LimitedRanked.id = web_article.id %s %s
+		) AS LimitedRanked ON LimitedRanked.id = web_article.id
 		ORDER BY LimitedRanked.row_num ASC LIMIT %d
-		`, sql, praise, collect, text_count, cursor, praise_join, collect_join, limit)
+		`, sql, praise, collect, text_count, cursor, limit)
 		fmt.Println(sql)
 
 		if err := db.Raw(sql).Scan(&articles).Error; err != nil {
diff --git a/api/collect.go b/api/collect.go
index 8d876c4..e0c8f45 100644
--- a/api/collect.go
+++ b/api/collect.go
@@ -145,32 +145,19 @@ var CollectionItems = &graphql.Field{
 
 		// 字段选择
 		var user_id = p.Context.Value("user_id").(int)
-		//var fields = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
-		//var praise, praise_join, collect, collect_join, text_count string
-		//if funk.Contains(fields, "praise") {
-		//	praise = ",CASE WHEN web_praise.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_praise"
-		//	praise_join = fmt.Sprintf("LEFT JOIN web_praise ON web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0", user_id)
-		//}
-		//if funk.Contains(fields, "collect") {
-		//	collect = ",CASE WHEN web_collect.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_collect"
-		//	collect_join = fmt.Sprintf("LEFT JOIN web_collect ON web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0", user_id)
-		//}
-
 		var items = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
-		var fan, fan_join string
+		var fan string
 		if funk.Contains(items, "fan") {
-			fan = ",CASE WHEN web_fans.id IS NOT NULL THEN TRUE ELSE FALSE END AS fan"
-			fan_join = fmt.Sprintf("LEFT JOIN web_fans ON web_fans.follower_id = %d AND web_fans.blogger_id = web_member_explorer.id AND web_fans.type = 3", user_id)
-			//fan = fmt.Sprintf(",(SELECT COUNT(*) FROM web_fans WHERE follower_id = %d AND blogger_id = web_member_explorer.id AND type = 3) AS fan", user_id)
+			fan = fmt.Sprintf(",CASE WHEN EXISTS (SELECT 1 FROM web_fans WHEREweb_fans.follower_id = %d AND web_fans.blogger_id = web_member_explorer.id AND web_fans.type = 3) THEN TRUE ELSE FALSE END AS is_praise", user_id)
 		}
 
 		sql = fmt.Sprintf(`
 		WITH RankedArticles AS (%s)
 		SELECT web_member_explorer.* %s FROM web_member_explorer INNER JOIN(
 			SELECT id, row_num FROM RankedArticles %s
-		) AS LimitedRanked ON LimitedRanked.id = web_member_explorer.id %s
+		) AS LimitedRanked ON LimitedRanked.id = web_member_explorer.id
 		ORDER BY LimitedRanked.row_num ASC LIMIT %d
-		`, sql, fan, cursor, fan_join, limit)
+		`, sql, fan, cursor, limit)
 
 		fmt.Println(sql)
 
diff --git a/api/game.go b/api/game.go
index ca3afcb..3b3c369 100644
--- a/api/game.go
+++ b/api/game.go
@@ -191,31 +191,21 @@ var GameItems = &graphql.Field{
 		// 字段选择
 		var user_id = p.Context.Value("user_id").(int)
 		var fields = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
-		var praise, praise_join, collect, collect_join, text_count string
+		var praise, collect, text_count string
 		if funk.Contains(fields, "praise") {
-			praise = ",CASE WHEN web_praise.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_praise"
-			//praise_join = fmt.Sprintf("LEFT JOIN web_praise ON web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0", user_id)
-			praise_join = fmt.Sprintf("LEFT JOIN (SELECT DISTINCT praise_id FROM web_praise WHERE user_id = %d AND type = 0) AS web_praise ON web_praise.praise_id = web_article.id", user_id)
+			praise = fmt.Sprintf(",CASE WHEN EXISTS (SELECT 1 FROM web_praise WHERE web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0) THEN TRUE ELSE FALSE END AS is_praise", user_id)
 		}
 		if funk.Contains(fields, "collect") {
-			collect = ",CASE WHEN web_collect.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_collect"
-			//collect_join = fmt.Sprintf("LEFT JOIN web_collect ON web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0", user_id)
-			collect_join = fmt.Sprintf(`
-			LEFT JOIN (
-				SELECT DISTINCT collect_id 
-				FROM web_collect 
-				WHERE user_id = %d AND type = 0
-			) AS web_collect ON web_collect.collect_id = web_article.id
-			`, user_id)
+			collect = fmt.Sprintf(",CASE WHEN EXISTS (SELECT 1 FROM web_collect WHERE web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0) THEN TRUE ELSE FALSE END AS is_collect", user_id)
 		}
 
 		sql = fmt.Sprintf(`
 		WITH RankedArticles AS (%s)
-		SELECT * %s %s %s FROM web_article INNER JOIN(
+		SELECT web_article.* %s %s %s FROM web_article INNER JOIN(
 			SELECT id, row_num FROM RankedArticles %s
-		) AS LimitedRanked ON LimitedRanked.id = web_article.id %s %s
+		) AS LimitedRanked ON LimitedRanked.id = web_article.id
 		ORDER BY LimitedRanked.row_num ASC LIMIT %d
-		`, sql, praise, collect, text_count, cursor, praise_join, collect_join, limit)
+		`, sql, praise, collect, text_count, cursor, limit)
 
 		fmt.Println(sql)
 
diff --git a/api/image.go b/api/image.go
index 48b7749..b603840 100644
--- a/api/image.go
+++ b/api/image.go
@@ -105,7 +105,6 @@ var imageType = graphql.NewObject(graphql.ObjectConfig{
 					fmt.Println(user_id, p.Source.(Image).ID, praise, "E", err)
 					return false, nil
 				}
-				//fmt.Println(user_id, p.Source.(Image).ID, praise)
 				if praise > 0 {
 					return true, nil
 				}
@@ -536,24 +535,6 @@ var ImageItems = &graphql.Field{
 					return nil, err
 				}
 				fmt.Println(color, r, g, b, precision)
-				//query = query.Where(goqu.Or(
-				//	goqu.And(
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_r", 0)).Gt(r-precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_r", 0)).Lt(r+precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_g", 0)).Gt(g-precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_g", 0)).Lt(g+precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_b", 0)).Gt(b-precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_b", 0)).Lt(b+precision),
-				//	),
-				//	goqu.And(
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_r", 1)).Gt(r-precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_r", 1)).Lt(r+precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_g", 1)).Gt(g-precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_g", 1)).Lt(g+precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_b", 1)).Gt(b-precision),
-				//		goqu.L(fmt.Sprintf("web_images.color_%d_b", 1)).Lt(b+precision),
-				//	),
-				//))
 
 				query1, _, _ := goqu.Dialect("mysql").From("web_images").Select("id").Where(
 					goqu.And(
@@ -602,12 +583,6 @@ var ImageItems = &graphql.Field{
 			)).As("row_num"))
 		}
 
-		//// 针对排行榜优化, 减少结果集
-		//if p.Args["sort"] != nil && p.Args["sort"].(string) == "day_rank" {
-		//	fmt.Println("针对排行榜优化, 减少结果集 day_rank > 0")
-		//	query = query.Where(goqu.L("day_rank > 0"))
-		//}
-
 		// 图像按点赞顺序排序 p.Args["sort"].(string) == "praise_time"
 		if p.Args["praise"] != nil {
 			query = query.Select("web_images.id", goqu.L(
diff --git a/api/work.go b/api/work.go
index 10a2f29..ac442f1 100644
--- a/api/work.go
+++ b/api/work.go
@@ -169,23 +169,21 @@ var WorkItems = &graphql.Field{
 		// 字段选择
 		var user_id = p.Context.Value("user_id").(int)
 		var fields = ListItem(p.Info.FieldASTs[0].SelectionSet.Selections)
-		var praise, praise_join, collect, collect_join, text_count string
+		var praise, collect, text_count string
 		if funk.Contains(fields, "praise") {
-			praise = ",CASE WHEN web_praise.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_praise"
-			praise_join = fmt.Sprintf("LEFT JOIN web_praise ON web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0", user_id)
+			praise = fmt.Sprintf(",CASE WHEN EXISTS (SELECT 1 FROM web_praise WHERE web_praise.praise_id = web_article.id AND web_praise.user_id = %d AND web_praise.type = 0) THEN TRUE ELSE FALSE END AS is_praise", user_id)
 		}
 		if funk.Contains(fields, "collect") {
-			collect = ",CASE WHEN web_collect.id IS NOT NULL THEN TRUE ELSE FALSE END AS is_collect"
-			collect_join = fmt.Sprintf("LEFT JOIN web_collect ON web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0", user_id)
+			collect = fmt.Sprintf(",CASE WHEN EXISTS (SELECT 1 FROM web_collect WHERE web_collect.collect_id = web_article.id AND web_collect.user_id = %d AND web_collect.type = 0) THEN TRUE ELSE FALSE END AS is_collect", user_id)
 		}
 
 		sql = fmt.Sprintf(`
 		WITH RankedArticles AS (%s)
-		SELECT * %s %s %s FROM web_article INNER JOIN(
+		SELECT web_article.* %s %s %s FROM web_article INNER JOIN(
 			SELECT id, row_num FROM RankedArticles %s
-		) AS LimitedRanked ON LimitedRanked.id = web_article.id %s %s
+		) AS LimitedRanked ON LimitedRanked.id = web_article.id
 		ORDER BY LimitedRanked.row_num ASC LIMIT %d
-		`, sql, praise, collect, text_count, cursor, praise_join, collect_join, limit)
+		`, sql, praise, collect, text_count, cursor, limit)
 
 		fmt.Println(sql)