diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index 528ef42..985c333 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -356,7 +356,7 @@ public class PatrolTaskController extends BaseController { return resultAnalysis.getFilterDesc().equals(element.getFilterDesc()); }).collect(Collectors.toList()); } - Map keyPatrolData = new HashMap<>(); + Map keyPatrolData = new LinkedHashMap<>(); for (PatrolData patrolData : newList) { keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); } @@ -2541,7 +2541,7 @@ public class PatrolTaskController extends BaseController { } newList.addAll(filterList); newList.addAll(brightNewList); - Map keyPatrolData = new HashMap<>(); + Map keyPatrolData = new LinkedHashMap<>(); for (PatrolData patrolData : newList) { keyPatrolData.putIfAbsent(patrolData.getObjectId() + "_" + patrolData.getAlgType(), patrolData); } @@ -2955,7 +2955,7 @@ public class PatrolTaskController extends BaseController { if (!filterDatas.isEmpty()) { item.setImg(filterDatas.get(0).getImgAnalyse()); item.setFilterDesc(filterDatas.get(0).getDesc()); - filterList.remove(filterDatas.get(0)); + filterList.removeAll(filterDatas); } // else { // item.setImg("");