Commit 24d84879f9568a8f64ca1f0527eaa32e80af0288
1 parent
9da5f17ab0
Exists in
master
and in
6 other branches
update code
Showing 2 changed files with 10 additions and 3 deletions
platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
View file @
24d8487
| ... | ... | @@ -125,7 +125,7 @@ |
| 125 | 125 | AND date_format(CHECK_TIME,'%Y-%m-%d') = date_format(#{checkTime},'%Y-%m-%d') |
| 126 | 126 | </if> |
| 127 | 127 | |
| 128 | - <if test="titles.size() !=0 "> | |
| 128 | + <if test="titles != null and titles.size() !=0 "> | |
| 129 | 129 | AND TITLE IN |
| 130 | 130 | <foreach collection="titles" item="title" |
| 131 | 131 | index="index" open="(" close=")" separator=","> |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
View file @
24d8487
| ... | ... | @@ -411,7 +411,10 @@ |
| 411 | 411 | { |
| 412 | 412 | model.setVcCardNo(vcCardNo); |
| 413 | 413 | List<LisReportModel> lises = lisService.queryLisDataByModel(model); |
| 414 | - reportModelList.addAll(lises); | |
| 414 | + if (CollectionUtils.isNotEmpty(lises)) | |
| 415 | + { | |
| 416 | + reportModelList.addAll(lises); | |
| 417 | + } | |
| 415 | 418 | } |
| 416 | 419 | if (StringUtils.isNotEmpty(phone)) |
| 417 | 420 | { |
| ... | ... | @@ -472,7 +475,11 @@ |
| 472 | 475 | { |
| 473 | 476 | model.setVcCardNo(vcCardNo); |
| 474 | 477 | List<LisReportModel> lises = lisService.queryLisDataByModel(model); |
| 475 | - reportModelList.addAll(lises); | |
| 478 | + if (CollectionUtils.isNotEmpty(lises)) | |
| 479 | + { | |
| 480 | + reportModelList.addAll(lises); | |
| 481 | + } | |
| 482 | + | |
| 476 | 483 | } |
| 477 | 484 | else if (StringUtils.isNotEmpty(phone)) |
| 478 | 485 | { |