From d6ef4b4d2f2a2283d069772ccfa6eb6905b174a7 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Thu, 11 Nov 2021 15:39:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=AF=94excel=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E6=A0=87=E5=87=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/ImportExcelDatas/comment/ExclExport.java    | 4 ++--
 .../service/impl/ImportExcelServiceImpl.java                | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java
index 82d2f20c..40b9703e 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/comment/ExclExport.java
@@ -78,8 +78,8 @@ public class ExclExport extends ExclErrorOut {
                 Set<List<String>> collect = set.stream()
                         .filter(item ->
                                 value.contains(item.get(0).trim())
-                                        || value.contains(item.get(1).trim())
-                                        || value.contains(item.get(2).trim())
+                                        && value.contains(item.get(1).trim())
+                                        && value.contains(item.get(2).trim())
                         )
                         .collect(Collectors.toSet());
 
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
index 765ed853..6ff028c3 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/ImportExcelDatas/service/impl/ImportExcelServiceImpl.java
@@ -603,18 +603,18 @@ public class ImportExcelServiceImpl extends ServiceImpl<ImportExcelDao, ImportDt
     public String isExist(MultipartFile exclFile) {
         ExclExport exclExport = new ExclExport();
         QueryWrapper<SarStandardsInfo> standWrapper = new QueryWrapper<>();
-        standWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR");
+        standWrapper.select("STAND_NUMBER,STAND_SORT,STAND_YEAR");
         List<Map<String, Object>> maps = sarStandardsInfoService.listMaps(standWrapper);
 
         QueryWrapper<SarBussionessStand> bussionessWrapper = new QueryWrapper<>();
-        bussionessWrapper.select("STAND_NAME,STAND_SORT,STAND_YEAR");
+        bussionessWrapper.select("STAND_CODE AS STAND_NUMBER,STAND_SORT,STAND_YEAR");
         List<Map<String, Object>> maps1 = sarBussionessStandService.listMaps(bussionessWrapper);
 
         HashSet<List<String>> nameSet = new HashSet<>();
         maps.addAll(maps1);
         maps.forEach(item->{
             List<String> strings = new LinkedList<>();
-            strings.add(item.get("STAND_NAME").toString().trim());
+            strings.add(item.get("STAND_NUMBER").toString().trim());
             strings.add(item.get("STAND_SORT").toString().trim());
             strings.add(item.get("STAND_YEAR").toString().trim());