Merge branch 'feature/bug-1333' into feature/quotation
This commit is contained in:
commit
c2924b7f99
|
|
@ -5,7 +5,7 @@
|
|||
<select id="get" resultType="com.nflg.mobilebroken.common.pojo.vo.ProductCaseVO">
|
||||
SELECT pci.`desc`, pci.image, pci.video
|
||||
FROM product_case pc
|
||||
INNER JOIN product_case_info pci ON pci.case_id = pc.id AND pci.language_code = #{language}
|
||||
INNER JOIN product_case_info pci ON pci.case_id = pc.id AND pci.language_code = #{language} and LENGTH(pci.video)>0
|
||||
WHERE pc.`enable` = 1 AND pc.`state` = 1
|
||||
ORDER BY pc.sort DESC
|
||||
</select>
|
||||
|
|
@ -15,6 +15,5 @@
|
|||
SELECT #{newId},language_code,`desc`,image,video,create_by,create_time,update_by,update_time
|
||||
FROM product_case_info
|
||||
WHERE case_id=#{oldId}
|
||||
|
||||
</select>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
SELECT pmvi.*
|
||||
FROM product_model_video pmv
|
||||
INNER JOIN product_model_video_item pmvi ON pmv.id=pmvi.model_video_id
|
||||
WHERE pmv.state=1 AND pmv.`enable`=1 AND pmv.model_id=#{modelId} AND pmvi.language_code=#{language}
|
||||
WHERE pmv.state=1 AND pmv.`enable`=1 AND pmv.model_id=#{modelId} AND pmvi.language_code=#{language} and LENGTH(pmvi.video)>0
|
||||
ORDER BY pmv.sort DESC
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue