From 2b3eda2de9553becee62c37765a9f29340229411 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 17 Nov 2025 18:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/web/service/enterprise/TechnicalService.java    | 2 +-
 bonus-mainDatabase/src/main/resources/mapper/ToolMapper.xml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java
index c6dbf2c..e745c8f 100644
--- a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java
+++ b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/TechnicalService.java
@@ -136,7 +136,7 @@ public class TechnicalService {
             // 1.技术方案库类别是否存在子集
             int result = imdTechnicalService.hasChildData(dto);
             if(result > 0){
-                return AjaxResult.error("技术方案库类别子集数据，无法删除");
+                return AjaxResult.error("技术方案库类别存在子集数据，无法删除");
             }
             // 2.添加技术方案库类别数据
             imdTechnicalService.operTypeData(dto, 3);
diff --git a/bonus-mainDatabase/src/main/resources/mapper/ToolMapper.xml b/bonus-mainDatabase/src/main/resources/mapper/ToolMapper.xml
index f63e05f..41cefd7 100644
--- a/bonus-mainDatabase/src/main/resources/mapper/ToolMapper.xml
+++ b/bonus-mainDatabase/src/main/resources/mapper/ToolMapper.xml
@@ -104,10 +104,10 @@
     <!--企业知识库->工器具库->查询工器具名称是否重复-->
     <select id="isRepeat" resultType="java.lang.Integer">
         <if test="toolId == null">
-            SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_name = #{toolName} AND model = #{model} AND  del_flag = '0'
+            SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_name = #{toolName} AND model = #{model} AND enterprise_id = #{enterpriseId} AND  del_flag = '0'
         </if>
         <if test="toolId!=null">
-            SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_id !=#{toolId} AND tool_name = #{toolName} AND model = #{model} AND  del_flag = '0'
+            SELECT COUNT(*) FROM tb_enterprise_tool WHERE tool_id !=#{toolId} AND tool_name = #{toolName} AND model = #{model} AND enterprise_id = #{enterpriseId} AND  del_flag = '0'
         </if>
     </select>
     <!--企业知识库->工器具库->查询已存在的工器具-->