处理上架不了的问题

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ReleaseProductByBatchServiceImpl.java

@@ -1065,7 +1065,7 @@ public class ReleaseProductByBatchServiceImpl implements ReleaseProductByBatchSe
 		aProduct.setBrandEnByExcel(brandValue);
 		// pcb模块判断类目是否为商城标准品牌
 		if (isPcb && !StringUtils.isEmpty(aProduct.getBrandNameEn())) {
-			List<BrandInfo> brandInfos = brandInfoDao.findByNameEn(aProduct.getBrandNameEn());
+			List<BrandInfo> brandInfos = brandInfoDao.findByName(aProduct.getBrandNameEn());
 			if (CollectionUtils.isNotEmpty(brandInfos)) {
 				BrandInfo brandInfo = brandInfos.get(0);
 				if (brandInfo != null && brandInfo.getId() != null) {

src/main/java/com/uas/platform/b2c/prod/product/brand/dao/BrandInfoDao.java

@@ -1,18 +1,12 @@
 package com.uas.platform.b2c.prod.product.brand.dao;
 
-import java.util.List;
-
-import javax.persistence.QueryHint;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.jpa.repository.QueryHints;
+import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
+import org.springframework.data.jpa.repository.*;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2c.prod.product.brand.modal.BrandInfo;
+import javax.persistence.QueryHint;
+import java.util.List;
 
 /**
  * 品牌简易信息
@@ -50,6 +44,14 @@ public interface BrandInfoDao extends JpaSpecificationExecutor<BrandInfo>, JpaRe
 	@QueryHints({ @QueryHint(name = "org.hibernate.cacheable", value = "true") })
 	public List<BrandInfo> findByNameCn(String nameCn);
 
+	/**
+	 * 根据品牌中文名和英文名 获取品牌信息
+	 * @param name 品牌名称
+	 * @return List<BrandInfo>
+	 */
+	@Query(value = "select b from BrandInfo b where b.nameCn = :name or b.nameEn = :name")
+	List<BrandInfo> findByName(@Param("name") String name);
+
 	/**
 	 * 根据品牌英文名查找品牌信息
 	 *