Commit d0b9005ff5b5c34fb0dd1ad7eb050a4846972df5
1 parent
deb389c776
Exists in
master
and in
6 other branches
高危检查列表
Showing 1 changed file with 14 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
View file @
d0b9005
| ... | ... | @@ -668,7 +668,7 @@ |
| 668 | 668 | List currentRiskList = oneRecord.gethRisk(); |
| 669 | 669 | List beforeRiskList = twoRecord.gethRisk(); |
| 670 | 670 | |
| 671 | - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) | |
| 671 | + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList)) | |
| 672 | 672 | { |
| 673 | 673 | ids.add(oneRecord.getId()); |
| 674 | 674 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| ... | ... | @@ -683,7 +683,7 @@ |
| 683 | 683 | incrHrisk.add(riskId); |
| 684 | 684 | } |
| 685 | 685 | } |
| 686 | - if (CollectionUtils.isNotEmpty(incrHrisk)) | |
| 686 | + if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk)) | |
| 687 | 687 | { |
| 688 | 688 | ids.add(oneRecord.getId()); |
| 689 | 689 | incriskMap.put(oneRecord.getId(), incrHrisk); |
| ... | ... | @@ -711,7 +711,7 @@ |
| 711 | 711 | |
| 712 | 712 | List currentRiskList = oneRecord.gethRisk(); |
| 713 | 713 | List beforeRiskList = twoRecord.gethRisk(); |
| 714 | - if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) | |
| 714 | + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6") && getConditionRisk(request.getRiskFactorId(),currentRiskList)) | |
| 715 | 715 | { |
| 716 | 716 | ids.add(oneRecord.getId()); |
| 717 | 717 | incriskMap.put(oneRecord.getId(), currentRiskList); |
| ... | ... | @@ -726,7 +726,7 @@ |
| 726 | 726 | incrHrisk.add(String.valueOf(riskId)); |
| 727 | 727 | } |
| 728 | 728 | } |
| 729 | - if (CollectionUtils.isNotEmpty(incrHrisk)) | |
| 729 | + if (CollectionUtils.isNotEmpty(incrHrisk) && getConditionRisk(request.getRiskFactorId(),incrHrisk)) | |
| 730 | 730 | { |
| 731 | 731 | ids.add(oneRecord.getId()); |
| 732 | 732 | incriskMap.put(oneRecord.getId(), incrHrisk); |
| 733 | 733 | |
| ... | ... | @@ -737,11 +737,10 @@ |
| 737 | 737 | } |
| 738 | 738 | } |
| 739 | 739 | |
| 740 | - if (CollectionUtils.isEmpty(ids) || !incriskMap.containsValue(request.getRiskFactorId())) | |
| 740 | + if (CollectionUtils.isEmpty(ids)) | |
| 741 | 741 | { |
| 742 | 742 | return null; |
| 743 | 743 | } |
| 744 | - | |
| 745 | 744 | pageAntExRecordsQuery.setNeed("true"); |
| 746 | 745 | pageAntExRecordsQuery.setPage(request.getPage()); |
| 747 | 746 | pageAntExRecordsQuery.setLimit(request.getLimit()); |
| ... | ... | @@ -759,6 +758,15 @@ |
| 759 | 758 | } |
| 760 | 759 | |
| 761 | 760 | return pageAntExRecords; |
| 761 | + } | |
| 762 | + | |
| 763 | + private boolean getConditionRisk(String riskId,List<String> incrHrisk) | |
| 764 | + { | |
| 765 | + if (StringUtils.isEmpty(riskId)) | |
| 766 | + { | |
| 767 | + return true; | |
| 768 | + } | |
| 769 | + return incrHrisk.contains(riskId); | |
| 762 | 770 | } |
| 763 | 771 | |
| 764 | 772 |