Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/facade/base/DrugInfoFacade.java

@@ -26,13 +26,12 @@ public class DrugInfoFacade extends DrugInfoServiceImpl {
      */
     public boolean isExist(DrugInfo drugInfo) {
         if (drugInfo.getHospitalId() != null
-                || StringUtil.isBlank(drugInfo.getCode())
                 || StringUtil.isBlank(drugInfo.getName())) {
             Asserts.fail("判断即将新增/修改的药品是否与已存在的其他药品存在冲突时，hospitalId、code、name不能为空！");
         }
         QueryWrapper<DrugInfo> drugInfoQueryWrapper = new QueryWrapper<>();
         drugInfoQueryWrapper.eq("hospital_id", drugInfo.getHospitalId());
-        drugInfoQueryWrapper.eq("code", drugInfo.getCode());
+        drugInfoQueryWrapper.eq(StringUtil.isNotBlank(drugInfo.getCode()),"code", drugInfo.getCode());
         drugInfoQueryWrapper.eq("name", drugInfo.getName());
         List<DrugInfo> drugInfoList = list(drugInfoQueryWrapper);
         if (drugInfo.getId() == null) {