From 37ec7ce93af10582f0156cdc031240ce443a5ca4 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Wed, 28 Aug 2024 10:50:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/bracelet/BaseProjectMapper.xml    | 6 +++---
 .../main/resources/mapper/bracelet/EngineeringMapper.xml    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
index 6ea70f0..3bbd78c 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/BaseProjectMapper.xml
@@ -80,9 +80,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update tb_project_depart
 		<set>
 			<if test="projectDepartName != null and projectDepartName != ''">depart_name = #{projectDepartName},</if>
-			<if test="projectHeadName != null and projectHeadName != ''">head_name = #{projectHeadName},</if>
-			<if test="contactInformation != null and contactInformation != ''">contact_information = #{contactInformation},</if>
-			<if test="remarks != null">remarks = #{remarks},</if>
+			head_name = #{projectHeadName},
+			contact_information = #{contactInformation},
+			remarks = #{remarks},
 			<if test="updateBy != null and updateBy != ''">update_user = #{updateBy},</if>
 			update_time = sysdate()
 		</set>
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
index 6338c53..9cbbdc6 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EngineeringMapper.xml
@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <select id="isCodeExist" resultType="com.bonus.common.entity.bracelet.vo.GtVo">
             select tpp.id as gtId,tpp.power_name as gtCode,tpp.lon as lon,tpp.lat as lat
             from tb_project_power tpp
-            where tpp.power_name = #{gtCode}  and del_flag = 0
+            where tpp.power_name = #{gtCode} and tpp.pro_id = #{proId}  and del_flag = 0
         </select>
 
         <!--新增杆塔信息-->
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="isExist" resultType="com.bonus.common.entity.bracelet.vo.GtVo">
         select tpp.id as gtId,tpp.power_name as gtCode,tpp.lon as lon,tpp.lat as lat
         from tb_project_power tpp
-        where tpp.power_name = #{gtCode}  and tpp.id != #{gtId} and del_flag = 0
+        where tpp.power_name = #{gtCode}  and tpp.id != #{gtId} and tpp.pro_id = #{proId} and del_flag = 0
     </select>
 
     <!--修改杆塔信息-->