jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 78cd172c443e8192977902c1571ca0b82b692936

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

新增高危修改

Showing 1 changed file with 12 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 78cd172
... ... @@ -721,7 +721,18 @@
721 721  
722 722 List currentRiskList = oneRecord.gethRisk();
723 723 List beforeRiskList = twoRecord.gethRisk();
  724 +
  725 + if (CollectionUtils.isEmpty(currentRiskList) && CollectionUtils.isEmpty(beforeRiskList))
  726 + {
  727 + continue;
  728 + }
724 729 if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")
  730 + && CollectionUtils.isEmpty(currentRiskList))
  731 + {
  732 + continue;
  733 + }
  734 +
  735 + if (CollectionUtils.isNotEmpty(beforeRiskList) && beforeRiskList.contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")
725 736 && getConditionRisk(request.getRiskFactorId(),currentRiskList,request.getLevel()))
726 737 {
727 738 ids.add(oneRecord.getId());
... ... @@ -757,7 +768,7 @@
757 768 pageAntExRecordsQuery.setPage(request.getPage());
758 769 pageAntExRecordsQuery.setLimit(request.getLimit());
759 770 pageAntExRecordsQuery.setIds(ids);
760   - //pageAntExRecordsQuery.setLevelId(request.getLevel());
  771 + pageAntExRecordsQuery.setLevelId(request.getLevel());
761 772  
762 773  
763 774 List<AntExRecordModel> pageAntExRecords = recordService.queryAntExRecords(pageAntExRecordsQuery);