From 4f02559c1a307499b7030fc69d00e9d5238625f4 Mon Sep 17 00:00:00 2001
From: SUNJIABIN <sunjiabin0907@163.com>
Date: Tue, 4 Apr 2023 23:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SarBussionessStandServiceImpl.java   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
index 99e851e6..8eb894ea 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
@@ -2782,7 +2782,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
                          countSuccess++;
                      }
                  }catch (Exception e){
-                     return Result.error("导入失败，请查看导入的数据是否有问题");
+                     return Result.error("导入失败，请查看导入的数据是否有问题或导入的企标标号或企标名称重复");
                  }
 
                  String msg = "成功导入" + countSuccess + "条";
@@ -2887,19 +2887,19 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
 //            sarBussionessStand.setStandCode(standCode);
 //            // 根据标准号判断数据是否已存在
 //            //2021年4月9日 此处检查当前是否存在standId
-//            QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
-//            queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
-//                    .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
-//            List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
-//            Integer valIdFlag = 0;
-//            for (SarBussionessStand stand :list){
-//                if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
-//                    valIdFlag = stand.getValidFlag();
-//                    if (valIdFlag == 0){
-//                        throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
-//                    }
-//                }
-//            }
+            QueryWrapper<SarBussionessStand>queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode())
+                    .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName());
+            List<SarBussionessStand> list = iSarBussionessStandService.list(queryWrapper);
+            Integer valIdFlag = 0;
+            for (SarBussionessStand stand :list){
+                if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){
+                    valIdFlag = stand.getValidFlag();
+                    if (valIdFlag == 0){
+                        throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在");
+                    }
+                }
+            }
 
             //此处判断是否是带入的标准
             if(StringUtils.isNotBlank(sarBussionessStand.getId())) {