From 36b89e1ed7f4d0e316094e8094c0e8658b364711 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 17 Apr 2024 17:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=AE=A1=E5=88=92=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/base/ProMapper.xml          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
index aeacc16..a1b786d 100644
--- a/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
+++ b/securitycontrol-model/securitycontrol-system/src/main/resources/mapper/base/ProMapper.xml
@@ -346,6 +346,12 @@
     </select>
     <!--添加工序计划时杆塔是否被重复添加-->
     <select id="getTowerIsExist" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM tb_gx_plan WHERE gx_id = #{gxId} AND bid_code = #{bidCode} AND del_flag = 0
+        <if test="planId == null or planId == ''">
+            SELECT COUNT(*) FROM tb_gx_plan WHERE gx_id = #{gxId} AND bid_code = #{bidCode} AND del_flag = 0
+        </if>
+        <if test="planId != null and planId != ''">
+            SELECT COUNT(*) FROM tb_gx_plan WHERE gx_id = #{gxId} AND bid_code = #{bidCode} AND plan_id != #{planId} AND del_flag = 0
+        </if>
+
     </select>
 </mapper>
\ No newline at end of file