From 4e33cd4bbdb0794e335afbcc2d57c8ebfea4f2c6 Mon Sep 17 00:00:00 2001
From: laozt <2721205210@qq.com>
Date: Wed, 10 Jan 2024 13:41:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BEnterpriseNewServiceImpl.java           | 8 +++++---
 .../resources/mapper/yingji/BPlanEnterpriseMapper.xml     | 3 +--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BEnterpriseNewServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BEnterpriseNewServiceImpl.java
index a73015d..37a9c2c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BEnterpriseNewServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BEnterpriseNewServiceImpl.java
@@ -55,10 +55,12 @@ public class BEnterpriseNewServiceImpl extends ServiceImpl<BEnterpriseNewMapper,
     @Override
     public int insertBEnterpriseNew(BEnterpriseNew bEnterpriseNew) {
         BEnterpriseNewRequest bEnterpriseNewRequest = new BEnterpriseNewRequest();
+        BEnterpriseNewRequest second = new BEnterpriseNewRequest();
         bEnterpriseNewRequest.setEnterpriseName(bEnterpriseNew.getEnterpriseName());
-        bEnterpriseNewRequest.setEnterpriseId(bEnterpriseNew.getEnterpriseId());
-        List<BEnterpriseNewReponse> list = bEnterpriseNewMapper.selectBEnterpriseNewList(bEnterpriseNewRequest);
-        if (!list.isEmpty()) {
+        second.setEnterpriseId(bEnterpriseNew.getEnterpriseId());
+        List<BEnterpriseNewReponse> list1 = bEnterpriseNewMapper.selectBEnterpriseNewList(bEnterpriseNewRequest);
+        List<BEnterpriseNewReponse> list2 = bEnterpriseNewMapper.selectBEnterpriseNewList(second);
+        if (!list1.isEmpty() || !list2.isEmpty()) {
             throw new ServiceException("该企业已存在");
         } else {
             return bEnterpriseNewMapper.insertBEnterpriseNew(bEnterpriseNew);
diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
index 0ca8a55..3cff99d 100644
--- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
@@ -35,10 +35,9 @@
         from b_plan_enterprise
     </sql>
 
-
-
     <select id="selectBPlanEnterpriseList" parameterType="BPlanEnterprise" resultType="BPlanEnterpriseResponse">
         SELECT
+        DISTINCT
         a.id,
         a.enterprise_id,
         a.create_id,