bugfix

src/main/java/com/caimei365/commodity/model/vo/CmProductArchiveVO.java

@@ -142,14 +142,5 @@ public class CmProductArchiveVO implements Serializable {
      */
     private List<String> waters;
 
-    public CmProductArchiveVO setWaters(List<String> waters) {
-        List<String> strings = new ArrayList(waters.size());
-        if (waters != null) {
-            waters.forEach(s -> {
-                strings.add(AesEncryptUtil.encrypt(s));
-            });
-        }
-        this.waters = strings;
-        return this;
-    }
+
 }

src/main/java/com/caimei365/commodity/service/impl/CmProductArchiveContentServiceImpl.java

@@ -7,6 +7,7 @@ import com.caimei365.commodity.mapper.PriceMapper;
 import com.caimei365.commodity.model.po.KeyPo;
 import com.caimei365.commodity.model.vo.CmProductArchiveVO;
 import com.caimei365.commodity.service.CmProductArchiveContentService;
+import com.caimei365.commodity.utils.AesEncryptUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -37,7 +38,11 @@ public class CmProductArchiveContentServiceImpl implements CmProductArchiveConte
         List<CmProductArchiveVO> cmProductArchiveContentList = cmProductArchiveContentMapper.getCmProductArchiveContentList(cmProductArchiveVO);
         if (cmProductArchiveContentList != null) {
             for (CmProductArchiveVO productArchiveVO : cmProductArchiveContentList) {
-                productArchiveVO.setWaters(cmProductArchiveContentMapper.getProductArchiveFileList(productArchiveVO.getId()));
+                List<String> archiveFileList = cmProductArchiveContentMapper.getProductArchiveFileList(productArchiveVO.getId());
+                for (int i = 0; i < archiveFileList.size(); i++) {
+                    archiveFileList.set(i, AesEncryptUtil.encrypt(archiveFileList.get(i)));
+                }
+                productArchiveVO.setWaters(archiveFileList);
             }
         }
         return cmProductArchiveContentList;
@@ -69,7 +74,11 @@ public class CmProductArchiveContentServiceImpl implements CmProductArchiveConte
         if (byCmProductArchiveContent != null) {
             int permission = checkArchivePermission(byCmProductArchiveContent.getProductClassify(), Integer.valueOf(cmProductArchiveVO.getUserId()));
             byCmProductArchiveContent.setPermission(permission);
-            byCmProductArchiveContent.setWaters(cmProductArchiveContentMapper.getProductArchiveFileList(byCmProductArchiveContent.getId()));
+            List<String> archiveFileList = cmProductArchiveContentMapper.getProductArchiveFileList(cmProductArchiveVO.getId());
+            for (int i = 0; i < archiveFileList.size(); i++) {
+                archiveFileList.set(i, AesEncryptUtil.encrypt(archiveFileList.get(i)));
+            }
+            byCmProductArchiveContent.setWaters(archiveFileList);
 
         }
         return byCmProductArchiveContent;

src/main/resources/mapper/CmProductArchiveContentMapper.xml

@@ -208,13 +208,16 @@
 
 	<select id="findProductList" resultType="CmProductArchiveVO">
 		SELECT a.shopName as shopName,
-		ifnull(a.productName,(select name from product where productID=a.productId)) as productName,
+		ifnull(a.productName,p.name) as productName,
 		a.`productID` as productId,
-		a.productImage as image
+		ifnull(a.productImage,p.mainImage) as image
 		FROM cm_product_archive a
+		left join  product p on p.productID=a.productId
 		WHERE 1=1
 		<if test="productId != null ">and a.productId = #{productId}</if>
-		<if test="productName != null  and productName != ''">and a.productName like concat('%', #{productName}, '%')</if>
+		<if test="productName != null  and productName != ''">
+		  and (a.productName like concat('%', #{productName}, '%') or p.name like concat('%', #{productName}, '%'))
+		</if>
 		<if test="shopName != null  and shopName != ''">and a.shopName like concat('%', #{shopName}, '%')</if>
 		and a.productId is not null
 		group by a.productID