Commit cb4892bcf496b43eb299f9996d233d5ff1cad661
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
cb4892b
| ... | ... | @@ -628,7 +628,7 @@ |
| 628 | 628 | } |
| 629 | 629 | } |
| 630 | 630 | |
| 631 | - | |
| 631 | + //antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel()); | |
| 632 | 632 | List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC,"created"); |
| 633 | 633 | Map<String,List<AntExRecordModel>> map = handleAntexRecord(antExRecordModelList); |
| 634 | 634 | AntExRecordQuery pageAntExRecordsQuery = new AntExRecordQuery(); |
| ... | ... | @@ -673,7 +673,8 @@ |
| 673 | 673 | List currentRiskList = oneRecord.gethRisk(); |
| 674 | 674 | List beforeRiskList = twoRecord.gethRisk(); |
| 675 | 675 | |
| 676 | - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) | |
| 676 | + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") | |
| 677 | + && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) | |
| 677 | 678 | { |
| 678 | 679 | ids.add(oneRecord.getId()); |
| 679 | 680 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| ... | ... | @@ -720,7 +721,8 @@ |
| 720 | 721 | |
| 721 | 722 | List currentRiskList = oneRecord.gethRisk(); |
| 722 | 723 | List beforeRiskList = twoRecord.gethRisk(); |
| 723 | - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) | |
| 724 | + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") | |
| 725 | + && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel())) | |
| 724 | 726 | { |
| 725 | 727 | ids.add(oneRecord.getId()); |
| 726 | 728 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| ... | ... | @@ -792,7 +794,7 @@ |
| 792 | 794 | { |
| 793 | 795 | if (StringUtils.isEmpty(riskId)) |
| 794 | 796 | { |
| 795 | - return true && isExistsLevel(level,incrHrisk); | |
| 797 | + return isExistsLevel(level,incrHrisk); | |
| 796 | 798 | } |
| 797 | 799 | return incrHrisk.contains(riskId) && isExistsLevel(level,incrHrisk); |
| 798 | 800 | } |
| ... | ... | @@ -824,5 +826,8 @@ |
| 824 | 826 | } |
| 825 | 827 | return map; |
| 826 | 828 | } |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 827 | 832 | } |