|
@@ -54,18 +54,18 @@
|
|
WHERE xdm.id = xbuc.collect_id
|
|
WHERE xdm.id = xbuc.collect_id
|
|
AND xbuc.base_user_id = #{userId}
|
|
AND xbuc.base_user_id = #{userId}
|
|
AND xdm.del_flag = '0'
|
|
AND xdm.del_flag = '0'
|
|
- <if test="id != null">
|
|
|
|
- AND xbuc.id < #{id}
|
|
|
|
|
|
+ <if test="name != null">
|
|
|
|
+ AND xdm.model_name LIKE CONCAT( '%', #{name}, '%')
|
|
</if>
|
|
</if>
|
|
- <if test="modelName != null">
|
|
|
|
- AND xdm.model_name LIKE CONCAT( '%', #{modelName}, '%')
|
|
|
|
|
|
+ <if test="collectId != null">
|
|
|
|
+ AND xbuc.id < #{collectId}
|
|
</if>
|
|
</if>
|
|
- ORDER BY id DESC
|
|
|
|
|
|
+ ORDER BY xbuc.id DESC
|
|
LIMIT 10
|
|
LIMIT 10
|
|
</select>
|
|
</select>
|
|
|
|
|
|
<select id="queryAppById" resultType="com.xyzc.start.domain.vo.AppCollectVo">
|
|
<select id="queryAppById" resultType="com.xyzc.start.domain.vo.AppCollectVo">
|
|
- SELECT xbuc.id,
|
|
|
|
|
|
+ SELECT xbuc.id AS collect_id,
|
|
app.app_name,
|
|
app.app_name,
|
|
app.description AS app_desc,
|
|
app.description AS app_desc,
|
|
oss.url AS app_logo,
|
|
oss.url AS app_logo,
|
|
@@ -85,13 +85,13 @@
|
|
LEFT JOIN sys_oss oss2 ON oss2.oss_id = am.ai_model_logo_oss_id
|
|
LEFT JOIN sys_oss oss2 ON oss2.oss_id = am.ai_model_logo_oss_id
|
|
WHERE bu.id = #{userId} AND app.del_flag = '0'
|
|
WHERE bu.id = #{userId} AND app.del_flag = '0'
|
|
AND xbuc.is_collect = 1 AND xbuc.type = 3
|
|
AND xbuc.is_collect = 1 AND xbuc.type = 3
|
|
- <if test="appId != null">
|
|
|
|
- and app.id < #{appId}
|
|
|
|
|
|
+ <if test="name != null">
|
|
|
|
+ and app.app_name like concat('%',#{name},'%')
|
|
</if>
|
|
</if>
|
|
- <if test="appName != null">
|
|
|
|
- and app.app_name like concat('%',#{appName},'%')
|
|
|
|
|
|
+ <if test="collectId != null">
|
|
|
|
+ and xbuc.id < #{collectId}
|
|
</if>
|
|
</if>
|
|
- ORDER BY xbuc.create_time DESC
|
|
|
|
|
|
+ ORDER BY xbuc.id DESC
|
|
LIMIT 10
|
|
LIMIT 10
|
|
</select>
|
|
</select>
|
|
|
|
|
|
@@ -100,6 +100,8 @@
|
|
xbuc.collect_id AS graphics_id,
|
|
xbuc.collect_id AS graphics_id,
|
|
xbuc.is_collect,
|
|
xbuc.is_collect,
|
|
oss.url AS oss_url,
|
|
oss.url AS oss_url,
|
|
|
|
+ dg.with,
|
|
|
|
+ dg.height,
|
|
dg.title,
|
|
dg.title,
|
|
dg.use_count,
|
|
dg.use_count,
|
|
xdm.model_name,
|
|
xdm.model_name,
|
|
@@ -109,14 +111,14 @@
|
|
LEFT JOIN xy_draw_model xdm ON dg.model_id = xdm.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 sys_oss oss ON oss.oss_id = dg.oss_id
|
|
WHERE xbuc.base_user_id = #{userId}
|
|
WHERE xbuc.base_user_id = #{userId}
|
|
- and xbuc.type = 2
|
|
|
|
- <if test="graphicsId != null">
|
|
|
|
- and xbuc.collect_id > #{graphicsId}
|
|
|
|
|
|
+ and xbuc.type = 2 AND xbuc.is_collect = 1 AND dg.del_flag = '0'
|
|
|
|
+ <if test="name != null">
|
|
|
|
+ and dg.title like concat('%',#{name},'%')
|
|
</if>
|
|
</if>
|
|
- <if test="graphicsName != null">
|
|
|
|
- and dg.title like concat('%',#{graphicsName},'%')
|
|
|
|
|
|
+ <if test="collectId != null">
|
|
|
|
+ and xbuc.collect_id < #{collectId}
|
|
</if>
|
|
</if>
|
|
- ORDER BY xbuc.create_time DESC
|
|
|
|
|
|
+ ORDER BY xbuc.id DESC
|
|
LIMIT 10
|
|
LIMIT 10
|
|
</select>
|
|
</select>
|
|
|
|
|