From daffb5665736a7539d79df5b5a76ba5e3bd909a1 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Fri, 20 Dec 2024 10:13:45 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../udidl/admin/controller/collect/ThirdAliDrugController.java | 3 ++-
 .../resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/udidl/admin/controller/collect/ThirdAliDrugController.java b/src/main/java/com/glxp/udidl/admin/controller/collect/ThirdAliDrugController.java
index 35adc46..714fc2b 100644
--- a/src/main/java/com/glxp/udidl/admin/controller/collect/ThirdAliDrugController.java
+++ b/src/main/java/com/glxp/udidl/admin/controller/collect/ThirdAliDrugController.java
@@ -39,7 +39,8 @@ public class ThirdAliDrugController {
 
 
         if (StrUtil.isEmpty(thirdAliDrug.getApprovalNum()) && StrUtil.isEmpty(thirdAliDrug.getNameCode()) &&
-                StrUtil.isEmpty(thirdAliDrug.getCpmctymc())
+                StrUtil.isEmpty(thirdAliDrug.getCpmctymc())&&
+                StrUtil.isEmpty(thirdAliDrug.getManufacturer())
         ) {
             return ResultVOUtils.success("查询参数不能为空");
         }
diff --git a/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml b/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml
index 2cb5e17..973d060 100644
--- a/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/ThirdAliDrugMapper.xml
@@ -91,6 +91,9 @@
             <if test="approvalNum != '' and approvalNum != null">
                 AND approvalNum = #{approvalNum}
             </if>
+            <if test="manufacturer != '' and manufacturer != null">
+                AND manufacturer = #{manufacturer}
+            </if>
         </where>
     </select>
 </mapper>