Aslee 3 tahun lalu
induk
melakukan
4fc157017f

+ 1 - 1
src/main/java/com/caimei/service/impl/AuthProductServiceImpl.java

@@ -230,7 +230,7 @@ public class AuthProductServiceImpl implements AuthProductService {
             updateImageFlag = (StringUtils.isNotBlank(product.getCertificateImage()) && !product.getCertificateImage().equals(dbProduct.getCertificateImage())) || (StringUtils.isEmpty(dbProduct.getPcCertificateImage()) || StringUtils.isEmpty(dbProduct.getAppletsCertificateImage()));
             boolean addQrCodeSign = false;
             boolean addWaterMarkSign = false;
-            if (1 == dbAddQrCodeFlag) {
+            if (null != dbAddQrCodeFlag && 1 == dbAddQrCodeFlag) {
                 if (0 == addQrCodeFlag) {
                     // 原本是,现在否
                     if (updateImageFlag) {

+ 1 - 1
src/main/resources/mapper/AuthProductMapper.xml

@@ -159,7 +159,7 @@
         from cm_brand_auth_product
     </select>
     <select id="getWxProductList" resultType="com.caimei.model.vo.WxProductListVo">
-        select p.id as productId,p.authId, p.name as productName,p.snCode,p.image as productImage,a.authParty
+        select p.id as productId,p.authId, p.name as productName,p.snCode,p.image as productImage,a.authParty as clubName
         from cm_brand_auth_product p
         left join cm_brand_auth a on p.authId = a.id
         left join cm_brand_auth_user au on a.authUserId = au.authUserId