diff --git a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java index 59ee9dc9..c6b0198a 100644 --- a/src/main/java/com/spring/ifs/bean/BaseSearchBean.java +++ b/src/main/java/com/spring/ifs/bean/BaseSearchBean.java @@ -267,8 +267,21 @@ public class BaseSearchBean { break; } } - logger.info("返回集合大小:"+resultList.size()); - return resultList; + //过滤重复的数据 + List returnList = new ArrayList<>(); + Map checkMap = new HashMap<>(); + for (PartIfsInventory partIfsInventory : resultList){ + String key = partIfsInventory.getContract() +"-"+partIfsInventory.getPartNo(); + if (checkMap.containsKey(key)){ + int index = checkMap.get(key); + returnList.set(index, partIfsInventory); + }else { + returnList.add(partIfsInventory); + checkMap.put(key, returnList.size() - 1); + } + } + logger.info("返回集合大小:"+returnList.size()); + return returnList; } /** diff --git a/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java b/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java index 6c0d5159..7d2d2088 100644 --- a/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java +++ b/src/main/java/com/spring/ifs/bean/BaseSearchBeanTest.java @@ -277,8 +277,21 @@ public class BaseSearchBeanTest { break; } } - logger.info("返回集合大小:"+resultList.size()); - return resultList; + //过滤重复的数据 + List returnList = new ArrayList<>(); + Map checkMap = new HashMap<>(); + for (PartIfsInventory partIfsInventory : resultList){ + String key = partIfsInventory.getContract() +"-"+partIfsInventory.getPartNo(); + if (checkMap.containsKey(key)){ + int index = checkMap.get(key); + returnList.set(index, partIfsInventory); + }else { + returnList.add(partIfsInventory); + checkMap.put(key, returnList.size() - 1); + } + } + logger.info("返回集合大小:"+returnList.size()); + return returnList; } /**