|
@@ -363,11 +363,67 @@
|
|
|
a.create_time as article_create_time,
|
|
|
a.update_by as article_update_by,
|
|
|
a.update_time as article_update_time,
|
|
|
- a.address as address,
|
|
|
+ IFNULL(a.address, '未知') as address,
|
|
|
a.is_comment,
|
|
|
a.is_raffle,
|
|
|
- a.is_download
|
|
|
- FROM community_article a
|
|
|
+ a.is_download,
|
|
|
+ a.article_type,
|
|
|
+ COALESCE((
|
|
|
+ SELECT
|
|
|
+ JSON_ARRAYAGG(
|
|
|
+ CASE
|
|
|
+ WHEN b.id IS NOT NULL THEN
|
|
|
+ JSON_OBJECT(
|
|
|
+ 'id', IFNULL(b.id,''),
|
|
|
+ 'articleId', IFNULL(b.article_id,''),
|
|
|
+ 'imageUrl', IFNULL(b.image_url,''),
|
|
|
+ 'compressUrl', IFNULL(b.compress_url,''),
|
|
|
+ 'createBy', IFNULL(b.create_by,''),
|
|
|
+ 'createTime', IFNULL(DATE_FORMAT(b.create_time,'%Y-%m-%d %H:%i:%s'),''),
|
|
|
+ 'updateBy', IFNULL(b.update_by,''),
|
|
|
+ 'updateTime', IFNULL(DATE_FORMAT(b.update_time,'%Y-%m-%d %H:%i:%s'),'')
|
|
|
+ )
|
|
|
+ ELSE NULL
|
|
|
+ END
|
|
|
+ )
|
|
|
+ FROM
|
|
|
+ community_article_images b
|
|
|
+ WHERE
|
|
|
+ b.article_id = a.id
|
|
|
+ and (b.is_delete != 1 or b.is_delete is null)
|
|
|
+ ), '[]') AS images,
|
|
|
+ c.user_name as user_name,
|
|
|
+ c.nick_name as nick_name,
|
|
|
+ c.email as email,
|
|
|
+ c.avatar as avatar
|
|
|
+ # COALESCE((
|
|
|
+ # SELECT
|
|
|
+ # JSON_ARRAYAGG(
|
|
|
+ # CASE
|
|
|
+ # WHEN d.id IS NOT NULL THEN
|
|
|
+ # JSON_OBJECT(
|
|
|
+ # 'id', IFNULL(d.id,''),
|
|
|
+ # 'articleId', IFNULL(d.article_id,''),
|
|
|
+ # 'userId', IFNULL(d.user_id,''),
|
|
|
+ # 'content', IFNULL(d.content,''),
|
|
|
+ # 'createBy', IFNULL(d.create_by,''),
|
|
|
+ # 'createTime', IFNULL(DATE_FORMAT(d.create_time,'%Y-%m-%d %H:%i:%s'),''),
|
|
|
+ # 'updateBy', IFNULL(d.update_by,''),
|
|
|
+ # 'updateTime', IFNULL(DATE_FORMAT(d.update_time,'%Y-%m-%d %H:%i:%s'),'')
|
|
|
+ # )
|
|
|
+ # ELSE NULL
|
|
|
+ # END
|
|
|
+ # )
|
|
|
+ # FROM
|
|
|
+ # community_article_comment d
|
|
|
+ # WHERE
|
|
|
+ # d.article_id = a.id and d.is_delete != 1 order by d.create_time desc
|
|
|
+ # ), '[]') AS comments
|
|
|
+ from
|
|
|
+ community_article a
|
|
|
+ left join sys_user c on a.user_id = c.user_id
|
|
|
+ left join community_article_class e on e.article_id = a.id
|
|
|
+ left join community_article_tag f on f.article_id = a.id
|
|
|
WHERE a.create_by = #{userId}
|
|
|
AND NOT EXISTS (
|
|
|
SELECT 1
|