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);