From b3c2cf881918c78d7f027f3a15d402b6aea36c7b Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Mon, 25 Apr 2022 16:14:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=88=A0=E9=99=A4=E8=B4=9F?=
 =?UTF-8?q?=E8=B4=A3=E4=BA=BA=E7=9A=84=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../power/modules/axis/dao/PowerAxisStructLeaderDao.java      | 4 +---
 .../modules/axis/service/impl/PowerAxisLeaderServiceImpl.java | 4 +---
 .../axis/service/impl/PowerAxisStructLeaderServiceImpl.java   | 2 +-
 .../resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml   | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java
index db7c98a..2311760 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructLeaderDao.java
@@ -36,12 +36,10 @@ public interface PowerAxisStructLeaderDao extends BaseDao<PowerAxisStructLeaderE
      *
      * @param customerId   客户ID
      * @param axisStructId 节点ID
-     * @param leaderId     负责人ID
      * @return void
      * @author work@yujt.net.cn
      * @date 2022/4/25/0025 9:16
      */
     void deleteStructLeader(@Param("customerId") String customerId,
-                            @Param("axisStructId") String axisStructId,
-                            @Param("leaderId") String leaderId);
+                            @Param("axisStructId") String axisStructId);
 }
\ No newline at end of file
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java
index 70b91c6..8212a11 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisLeaderServiceImpl.java
@@ -93,9 +93,7 @@ public class PowerAxisLeaderServiceImpl extends BaseServiceImpl<PowerAxisLeaderD
         boolean i = updateById(entity);
         if (i) {
             // 关联表，先删除（by structReferenceId）,再插入
-            powerAxisStructLeaderDao.deleteStructLeader(
-                    dto.getCustomerId(), dto.getStructReferenceId(), dto.getId()
-            );
+            powerAxisStructLeaderDao.deleteStructLeader(dto.getCustomerId(), dto.getStructReferenceId());
             addStructLeaderRelation(
                     dto.getCustomerId(), dto.getStructReferenceId(), entity.getId(), dto.getCategoryCode()
             );
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java
index e2063a5..6302b3e 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java
@@ -138,7 +138,7 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl<PowerAxisS
 
     @Override
     public void bindAxisStructLeader(TokenDto tokenDto, StructLeaderBindFormDTO formDto) {
-        baseDao.deleteStructLeader(loginUserUtil.getLoginUserCustomerId(), formDto.getAxisStructId(), formDto.getLeaderId());
+        baseDao.deleteStructLeader(loginUserUtil.getLoginUserCustomerId(), formDto.getAxisStructId());
 
         PowerAxisStructLeaderEntity structLeader = new PowerAxisStructLeaderEntity();
         structLeader.setCustomerId(loginUserUtil.getLoginUserCustomerId());
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml
index 6e85d26..6dda231 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructLeaderDao.xml
@@ -17,7 +17,7 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
     <delete id="deleteStructLeader">
-        delete from pli_power_axis_struct_leader where CUSTOMER_ID = #{customerId} and STRUCT_REFERENCE_ID = #{axisStructId} and LEADER_ID = #{leaderId}
+        delete from pli_power_axis_struct_leader where CUSTOMER_ID = #{customerId} and STRUCT_REFERENCE_ID = #{axisStructId}
     </delete>
     <select id="queryLeaderDetailById"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerAxisSLeaderResultDTO">