From 78cd172c443e8192977902c1571ca0b82b692936 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 17 Jul 2018 14:29:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=AB=98=E5=8D=B1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/AntExRecordFacade.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 4f0d21b..1dc9a59 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -721,6 +721,17 @@ public class AntExRecordFacade { List currentRiskList = oneRecord.gethRisk(); List beforeRiskList = twoRecord.gethRisk(); + + if (CollectionUtils.isEmpty(currentRiskList) && CollectionUtils.isEmpty(beforeRiskList)) + { + continue; + } + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") + && CollectionUtils.isEmpty(currentRiskList)) + { + continue; + } + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) { @@ -757,7 +768,7 @@ public class AntExRecordFacade { pageAntExRecordsQuery.setPage(request.getPage()); pageAntExRecordsQuery.setLimit(request.getLimit()); pageAntExRecordsQuery.setIds(ids); - //pageAntExRecordsQuery.setLevelId(request.getLevel()); + pageAntExRecordsQuery.setLevelId(request.getLevel()); List pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery); -- 1.8.3.1