From 8e57238e26dddf37011eedd93ff932cb2b253aed Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Sat, 23 Apr 2022 11:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=88=A4=E9=87=8D=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/power/modules/axis/dao/PowerAxisStructDao.java     | 4 +++-
 .../main/resources/mapper/poweraxis/PowerAxisStructDao.xml    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java
index a3b81a3..c994d34 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java
@@ -77,13 +77,15 @@ public interface PowerAxisStructDao extends BaseDao<PowerAxisStructEntity> {
      * @param customerId   客户ID
      * @param agencyId     组织ID
      * @param categoryCode 节点级别编码（一级节点级别编码）
+     * @param id           主键
      * @return int
      * @author work@yujt.net.cn
      * @date 2022/4/23/0023 10:57
      */
     int countRepeatStructByCategory(@Param("customerId") String customerId,
                                     @Param("agencyId") String agencyId,
-                                    @Param("categoryCode") String categoryCode);
+                                    @Param("categoryCode") String categoryCode,
+                                    @Param("id") String id);
 
     List<String> getIdsByAgencyId(String agencyId, String customerId);
 
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
index 103c53d..f853869 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml
@@ -152,6 +152,7 @@
             pli_power_axis_struct
         WHERE
 	        AGENCY_ID = #{agencyId} and CUSTOMER_ID = #{customerId} and CATEGORY_CODE = #{categoryCode}
+	        <if test="id != null and id != ''">AND id != #{id}</if>
     </select>
     <select id="getIdsByAgencyId" resultType="java.lang.String">
         select id from pli_power_axis_struct where agency_id = #{agencyId} and customer_id = #{customerId}