Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/mapper/DocumentAuthMapper.xml

@@ -8,7 +8,7 @@
     </select>
 
     <select id="findOssArchive" resultType="com.caimei.www.pojo.document.OssArchive">
-        SELECT
+        SELECT DISTINCT
           coa.*,
           p.name AS productName,
           p.mainImage AS mainImage,
@@ -18,10 +18,11 @@
           cm_oss_archive coa
           LEFT JOIN product p ON coa.productId = p.productID
           LEFT JOIN shop s ON p.shopID = s.shopID
+          LEFT JOIN cm_oss_archive_pdf coap ON coap.archiveId = coa.id
           <if test="name != null and name != ''">
               WHERE (coa.name LIKE CONCAT('%',#{name},'%')
                OR p.name LIKE CONCAT('%',#{name},'%')
-               OR s.name LIKE CONCAT('%',#{name},'%'))
+               OR coap.name LIKE CONCAT('%',#{name},'%'))
           </if>
         ORDER BY
           coa.updateDate DESC