diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml index 41ff468..6f10bfc 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml @@ -125,7 +125,7 @@ AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d') - + AND TITLE IN diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 3c240ed..addde00 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -411,7 +411,10 @@ public class LisFacade { { model.setVcCardNo(vcCardNo); List lises = lisService.queryLisDataByModel(model); - reportModelList.addAll(lises); + if (CollectionUtils.isNotEmpty(lises)) + { + reportModelList.addAll(lises); + } } if (StringUtils.isNotEmpty(phone)) { @@ -472,7 +475,11 @@ public class LisFacade { { model.setVcCardNo(vcCardNo); List lises = lisService.queryLisDataByModel(model); - reportModelList.addAll(lises); + if (CollectionUtils.isNotEmpty(lises)) + { + reportModelList.addAll(lises); + } + } else if (StringUtils.isNotEmpty(phone)) {