fix 修改查询条件

boman-web-core/src/main/java/com/boman/web/core/service/vaccineInfo/impl/VaccineInfoServiceImpl.java

@@ -95,13 +95,23 @@ public class VaccineInfoServiceImpl implements IVaccineInfoService {
         //接种地点
         String vaccinationPlace = vaccineInfoOperation.getVaccinationPlace();
         List<String> idCardS = new ArrayList<>();
+        boolean flag = true;
         if ( StringUtils.isNotBlank(vaccinationPlace)) {
             VaccineInfoUser vaccineInfoUser = new VaccineInfoUser();
             vaccineInfoUser.setVaccinationPlace(vaccinationPlace);
             idCardS = vaccineInfoUserMapper.selectIdCardList(vaccineInfoUser);
+            if (idCardS.size() == 0){
+                flag = false;
+            }
             vaccineInfoOperation.setIdCardS(idCardS);
+
+        }
+
+        //如果查询条件查询疫苗表且没数据,就不要查询主表
+        List<VaccineInfoOperation> vaccineInfoOperations = new ArrayList<>();
+        if (flag){
+            vaccineInfoOperations = vaccineInfoMapper.selectVaccineInfoList(vaccineInfoOperation);
         }
-        List<VaccineInfoOperation> vaccineInfoOperations = vaccineInfoMapper.selectVaccineInfoList(vaccineInfoOperation);
 
 
         if (vaccineInfoOperations != null && vaccineInfoOperations.size() > 0) {