From 14958285211171fa22e93d7cfe41f5082d251694 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 23 Dec 2024 17:47:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E4=BF=9D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/collect/down/ThrOrderDownload.java   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
index 8812d2e1f..1ed616656 100644
--- a/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
+++ b/src/main/java/com/glxp/api/service/collect/down/ThrOrderDownload.java
@@ -109,10 +109,16 @@ public class ThrOrderDownload implements IDownload {
 
                     if (BusTypeConstant.QXCF001.getBusType().equals(collectOrderRequest.getBusType())){
                         collectOrderBiz.setRelId(entity.getRelId());
-                        BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper<BasicProductsEntity>().eq(BasicProductsEntity::getYbbm, entity.getYbbm()).last("limit 1"));
-                        if (basicProductsEntity == null || StrUtil.isEmpty(basicProductsEntity.getNameCode())) {
-                            errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";");
+
+                        if(StrUtil.isNotEmpty(entity.getCheckCode())){
+                            basicProductsDao.selectOne(new LambdaQueryWrapper<BasicProductsEntity>().like(BasicProductsEntity::getYbbm,entity.getCheckCode()));
+                        }else{
+                            BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new LambdaQueryWrapper<BasicProductsEntity>().eq(BasicProductsEntity::getYbbm, entity.getYbbm()).last("limit 1"));
+                            if (basicProductsEntity == null || StrUtil.isEmpty(basicProductsEntity.getNameCode())) {
+                                errorMsg.append(entity.getCpmctymc()).append("字典未对照").append(";");
+                            }
                         }
+
                         collectOrderBiz.setTagStatus(1);
                         collectOrderBiz.setUnTagCount(0);
                         bizList.add(collectOrderBiz);