bug fix

src/main/resources/mapper/PageMapper.xml

@@ -457,10 +457,15 @@
         order by addTime desc
     </select>
     <select id="getArchiveImageList" resultType="java.lang.String">
-        select ossUrl from cm_product_archive_file where archiveContentId = #{archiveContentId}
+        select ifnull(waterOssUrl, ossUrl) as ossUrl
+        from cm_product_archive_file
+        where archiveContentId = #{archiveContentId}
     </select>
     <select id="getArchiveFile" resultType="com.caimei365.commodity.model.po.ArchiveFilePo">
-        select fileName,ossName,uploadTime from cm_product_archive_file where archiveContentId = #{archiveContentId}
+        select fileName, if(cc.type = 2,ossName,ifnull(waterOssName, ossName)) as ossName, uploadTime
+        from cm_product_archive_file cf
+        left join cm_product_archive_content cc on cf.archiveContentId = cc.id
+        where archiveContentId = #{archiveContentId}
     </select>
     <select id="getArchiveByArchiveId" resultType="com.caimei365.commodity.model.po.ArchivePo">
         select cpa.id                                                                                   AS "archiveId",