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 badc3a4..ed59a19 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 @@ -628,7 +628,7 @@ public class AntExRecordFacade { } } - + antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC,"created"); Map> map = handleAntexRecord(antExRecordModelList); AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery(); @@ -673,7 +673,8 @@ public class AntExRecordFacade { List currentRiskList = oneRecord.gethRisk(); List beforeRiskList = twoRecord.gethRisk(); - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") + && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) { ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), currentRiskList); @@ -720,7 +721,8 @@ public class AntExRecordFacade { List currentRiskList = oneRecord.gethRisk(); List beforeRiskList = twoRecord.gethRisk(); - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") + && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) { ids.add(oneRecord.getId()); incriskMap.put(oneRecord.getId(), currentRiskList); @@ -790,11 +792,6 @@ public class AntExRecordFacade { private boolean getConditionRisk(String riskId,List incrHrisk,String level) { - if (StringUtils.isNotEmpty(level) && "315107bd-91fe-42a1-9237-752f3c046a40".equals(level)) - { - return false; - } - if (StringUtils.isEmpty(riskId)) { return true && isExistsLevel(level,incrHrisk);