Merge branch 'master-fix' into release

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/service/productbrandempower/ProductBrandEmpowerServiceImpl.java

@@ -323,7 +323,7 @@ public class ProductBrandEmpowerServiceImpl extends AbstractService<ProductBrand
         Long norCustomerId = productBrankMapper.getNorCustomerIdByOrderId(reqVO.getOrderId());
         Long neeCustomerId = productBrankMapper.getNeeCustomerIdByOrderId(reqVO.getOrderId());
 
-        if (norCustomerId != null && norCustomerId != 0 || neeCustomerId != null && neeCustomerId != 0) {
+        if ((norCustomerId != null && norCustomerId != 0) || (neeCustomerId != null && neeCustomerId != 0)) {
             //查看品牌与客户授权关系
             ProductBrandEmpowerBaseVO norProductBrandEmpowerBaseVO = new ProductBrandEmpowerBaseVO();
             norProductBrandEmpowerBaseVO.setProductBrandId(reqVO.getBrandId());
@@ -338,7 +338,7 @@ public class ProductBrandEmpowerServiceImpl extends AbstractService<ProductBrand
             neeProductBrandEmpowerBaseVO.setCustomerId(Objects.isNull(neeCustomerId) ? 0 : neeCustomerId);
             neeProductBrandEmpowerBaseVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
             //查询的授权信息
-            List<ProductBrandEmpowerDO> neeList = getProductBrandEmpowerList(norProductBrandEmpowerBaseVO);
+            List<ProductBrandEmpowerDO> neeList = getProductBrandEmpowerList(neeProductBrandEmpowerBaseVO);
             //没有授权的客户
             if ((norList == null || norList.size() == 0) && (neeList == null || neeList.size() == 0)) {
                 //未授权要查看品牌的授权模式，以及当前客户是否有特殊设置