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

src/main/java/com/uas/platform/b2c/prod/product/brand/service/impl/BrandSubmitServiceImpl.java

@@ -77,8 +77,8 @@ public class BrandSubmitServiceImpl implements BrandSubmitService {
 			// 如果是新增检查品牌是否重名，重名设置version为-1，返回前台判断是否更新已存在品牌
 			List<Brand> existBrandCn = new ArrayList<Brand>();
 			if (brandSubmit.getNameCn() != null)
-				existBrandCn = brandDao.findByNameCn(brandSubmit.getNameCn());
-			List<Brand> existBrandEn = brandDao.findByNameEn(brandSubmit.getNameEn());
+				existBrandCn = brandDao.findByUpperNameCn(brandSubmit.getNameCn());
+			List<Brand> existBrandEn = brandDao.findByUpperNameEn(brandSubmit.getNameEn());
 			if (CollectionUtils.isNotEmpty(existBrandCn)) {
 				brand.setVersion((short) -1);
 				return brand;
@@ -96,8 +96,8 @@ public class BrandSubmitServiceImpl implements BrandSubmitService {
 			Brand existBrand = brandDao.findByUuid(brandSubmit.getUuid());
 			// 如果uuid有误，则将申请uuid设为null，视为新增品牌申请
 			if (existBrand == null) {
-				List<Brand> existBrandCn = brandDao.findByNameCn(brandSubmit.getNameCn());
-				List<Brand> existBrandEn = brandDao.findByNameEn(brandSubmit.getNameEn());
+				List<Brand> existBrandCn = brandDao.findByUpperNameCn(brandSubmit.getNameCn());
+				List<Brand> existBrandEn = brandDao.findByUpperNameEn(brandSubmit.getNameEn());
 				if (CollectionUtils.isNotEmpty(existBrandCn)) {
 					brand.setVersion((short) -1);
 					return brand;