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 @@ AND approvalNum = #{approvalNum} + + AND manufacturer = #{manufacturer} +