From 06ac4b861529a4013cda5d6e9c07516b11aca900 Mon Sep 17 00:00:00 2001
From: Rui_Li <877258667@qq.com>
Date: Wed, 14 May 2025 09:38:36 +0800
Subject: [PATCH] =?UTF-8?q?BUG=20=E5=8E=BB=E9=87=8D=20=20=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E5=8A=A8=E6=80=81=E4=BF=AE=E6=94=B9=E9=80=A0=E6=88=90?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/spring/ifs/bean/BaseSearchBean.java     | 17 +++++++++++++++--
 .../com/spring/ifs/bean/BaseSearchBeanTest.java | 17 +++++++++++++++--
 2 files changed, 30 insertions(+), 4 deletions(-)

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<PartIfsInventory> returnList = new ArrayList<>();
+        Map<String, Integer> 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<PartIfsInventory> returnList = new ArrayList<>();
+        Map<String, Integer> 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;
     }
 
     /**