阳采单号校验问题

src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java

@@ -149,9 +149,11 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
             YcFileCodeUploadVo ycFileCodeUploadVo = list.get(j);
 
             //第一条进行 阳采单号的校验
-            if (j == 0 && StringUtils.isNotEmpty(ycBillNo)){
+            if (j == 0 && StringUtils.isNotEmpty(ycBillNo)) {
                 String ycBillNo1 = ycFileCodeUploadVo.getYcBillNo();
-                throw new JsonException("导入订单编号错误：当前绑定阳采业务单号【" + ycBillNo + "】 ， 导入阳采业务单号【" + ycBillNo1 + "】 ");
+                if (!StrUtil.trimToEmpty(ycBillNo).equals(StrUtil.trimToEmpty(ycBillNo1))) {
+                    throw new JsonException("导入订单编号错误：当前绑定阳采业务单号【" + ycBillNo + "】 ， 导入阳采业务单号【" + ycBillNo1 + "】 ");
+                }
             }
             String code = ycFileCodeUploadVo.getCode();
             addOrderRequest.setCode(code);
@@ -265,8 +267,8 @@ public class AlihealthBusServiceImpl implements AlihealthBusService {
         List<CompanyProductRelevanceEntity> companyProductRelevanceEntities = companyProductRelevanceDao.selectList(new LambdaQueryWrapper<CompanyProductRelevanceEntity>()
                 .eq(CompanyProductRelevanceEntity::getUdiRlIdFk, id)
                 .eq(CompanyProductRelevanceEntity::getCustomerId, userId));
-        if (CollUtil.isEmpty(companyProductRelevanceEntities)){
-            throw new JsonException(500, "当前产品标识:【"+ udiRelevance.getNameCode()+"】未添加文件中供应商配送服务！");
+        if (CollUtil.isEmpty(companyProductRelevanceEntities)) {
+            throw new JsonException(500, "当前产品标识:【" + udiRelevance.getNameCode() + "】未添加文件中供应商配送服务！");
         }
 
         AddBizProductReqeust productRequest = new AddBizProductReqeust();