Merge branch 'feature/bug-1333' into feature/quotation

nflg-mobilebroken-repository/src/main/resources/mapper/ProductModelVideoMapper.xml

@@ -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} and LENGTH(pmvi.video)>0
+        WHERE pmv.state=1 AND pmv.`enable`=1 AND pmv.model_id=#{modelId} AND pmvi.language_code=#{language} and (LENGTH(pmvi.video)>0 or LENGTH(pmvi.image)>0)
         ORDER BY pmv.sort DESC
     </select>