|
@@ -20,17 +20,17 @@
|
|
|
LEFT JOIN
|
|
|
(
|
|
|
SELECT
|
|
|
- D.tag_name,
|
|
|
+ D.circle_name,
|
|
|
COUNT(1) AS name_count
|
|
|
FROM
|
|
|
- community_tag D
|
|
|
+ community_circle D
|
|
|
LEFT JOIN
|
|
|
- community_article_tag E ON D.ID = E.tag_id
|
|
|
+ community_user_circle E ON D.ID = E.circle_id
|
|
|
WHERE
|
|
|
- D.is_delete = 0
|
|
|
+ (E.is_delete != 1 or E.is_delete is null)
|
|
|
GROUP BY
|
|
|
- D.tag_name
|
|
|
- ) F ON A.circle_name = F.tag_name
|
|
|
+ D.circle_name
|
|
|
+ ) F ON A.circle_name = F.circle_name
|
|
|
WHERE
|
|
|
B.circle_id IS NOT NULL AND B.expand_id = #{id}
|
|
|
ORDER BY
|