From 3e5b30f9ab571cb941e776a12ece9a79b2826a8d Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Fri, 31 Mar 2023 17:15:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=AF=BC=E5=85=A5=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E6=98=AF=E5=90=A6=E6=9C=89=E6=95=88=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=AF=E6=97=A0=E6=95=88=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=90=8C=E5=90=8D=E7=9A=84=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E6=88=96=E4=BC=81=E6=A0=87=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 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 a0227d72..a005e44a 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 @@ -2772,11 +2772,17 @@ public class SarBussionessStandServiceImpl extends ServiceImplqueryWrapper = new QueryWrapper<>(); queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); - Integer count = iSarBussionessStandService.count(queryWrapper); - if (count > 0){ - //return Result.error("当前企标标准号和企标名称已存在"); - throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); + List 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())) { bussId = sarBussionessStand.getId();