|
@@ -36,24 +36,23 @@
|
|
|
<select id="queryDrawModelById" resultType="com.xyzc.start.domain.vo.DrawModelCollectVo">
|
|
|
SELECT xdm.id AS id,
|
|
|
xbuc.id AS collect_id,
|
|
|
- oss.url AS oss_id,
|
|
|
+ xdm.oss_url AS oss_url,
|
|
|
xdm.model_name,
|
|
|
xdm.description,
|
|
|
xuu.id AS ugc_user_id,
|
|
|
- xuu.ugc_nick AS ugc_user_name,
|
|
|
- oss2.url AS ugc_user_avatar,
|
|
|
+ xuu.nick_name AS ugc_user_name,
|
|
|
+ xua.avatar AS ugc_user_avatar,
|
|
|
xdm.use_count AS use_count,
|
|
|
xbuc.is_collect AS is_collect,
|
|
|
xbuc.type AS type
|
|
|
FROM xy_base_user_collect xbuc
|
|
|
LEFT JOIN xy_draw_model xdm ON xdm.id = xbuc.collect_id
|
|
|
- LEFT JOIN sys_oss oss ON xdm.oss_id = oss.oss_id
|
|
|
- AND `type` = 1
|
|
|
- LEFT JOIN xy_ugc_user xuu ON xdm.ugc_id = xuu.id
|
|
|
- LEFT JOIN sys_oss oss2 ON xuu.avatar = oss2.oss_id
|
|
|
+ LEFT JOIN xy_ugc_user xuu ON xdm.ugc_user_id = xuu.id
|
|
|
+ LEFT JOIN xy_ugc_avatar xua ON xuu.ugc_avatar_id = xua.id
|
|
|
WHERE xdm.id = xbuc.collect_id
|
|
|
AND xbuc.base_user_id = #{userId}
|
|
|
AND xdm.del_flag = '0'
|
|
|
+ AND xbuc.type = 1
|
|
|
<if test="name != null">
|
|
|
AND xdm.model_name LIKE CONCAT( '%', #{name}, '%')
|
|
|
</if>
|
|
@@ -70,7 +69,7 @@
|
|
|
app.description AS app_desc,
|
|
|
oss.url AS app_logo,
|
|
|
app.id AS app_id,
|
|
|
- app.is_choiceness,
|
|
|
+ xda.discover_app_type AS is_choiceness,
|
|
|
app.use_count,
|
|
|
xbuc.type AS type,
|
|
|
am.ai_model_logo_oss_id AS ai_model_logo,
|
|
@@ -79,6 +78,7 @@
|
|
|
FROM xy_base_user_collect xbuc
|
|
|
LEFT JOIN xy_base_user bu ON bu.id = xbuc.base_user_id
|
|
|
LEFT JOIN xy_app app ON app.id = xbuc.collect_id
|
|
|
+ LEFT JOIN xy_discover_app xda ON xbuc.collect_id = xda.app_id
|
|
|
LEFT JOIN sys_oss oss ON oss.oss_id = app.oss_id
|
|
|
LEFT JOIN xy_ai_model_app xama ON app.id = xama.app_id
|
|
|
LEFT JOIN xy_ai_model am ON xama.ai_model_id = am.id
|
|
@@ -99,17 +99,16 @@
|
|
|
SELECT xbuc.id AS collect_id,
|
|
|
xbuc.collect_id AS graphics_id,
|
|
|
xbuc.is_collect,
|
|
|
- oss.url AS oss_url,
|
|
|
- dg.with,
|
|
|
+ dg.oss_url AS oss_url,
|
|
|
+ dg.width,
|
|
|
dg.height,
|
|
|
dg.title,
|
|
|
dg.use_count,
|
|
|
- xdm.model_name,
|
|
|
+ xam.ai_model_name AS model_name,
|
|
|
xbuc.type
|
|
|
FROM xy_base_user_collect xbuc
|
|
|
LEFT JOIN xy_draw_graphics dg ON xbuc.collect_id = dg.id
|
|
|
- LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.id
|
|
|
- LEFT JOIN sys_oss oss ON oss.oss_id = dg.oss_id
|
|
|
+ LEFT JOIN xy_ai_model xam ON dg.ai_model_id = xam.id
|
|
|
WHERE xbuc.base_user_id = #{userId}
|
|
|
and xbuc.type = 2 AND xbuc.is_collect = 1 AND dg.del_flag = '0'
|
|
|
<if test="name != null">
|