jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8f148f59d49af66771a8c7493d2fcca2caaa5dfd

Authored by liquanyu
1 parent 7c293b8c44
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

新增高危修改

Showing 1 changed file with 5 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 8f148f5
... ... @@ -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);
... ... @@ -790,11 +792,6 @@
790 792  
791 793 private boolean getConditionRisk(String riskId,List<String> incrHrisk,String level)
792 794 {
793   - if (StringUtils.isNotEmpty(level) && "315107bd-91fe-42a1-9237-752f3c046a40".equals(level))
794   - {
795   - return false;
796   - }
797   -
798 795 if (StringUtils.isEmpty(riskId))
799 796 {
800 797 return true && isExistsLevel(level,incrHrisk);