From 54f754ed43f84bb34ed4f4c0971def3c7cdedbea Mon Sep 17 00:00:00 2001
From: HAHA <HAHA@etoak.com>
Date: Sun, 24 Apr 2022 10:58:47 +0800
Subject: [PATCH] =?UTF-8?q?message:=20=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=90=8C=E4=B8=80=E7=88=B6=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E4=B8=8B=E4=B8=8D=E8=83=BD=E6=9C=89=E9=87=8D=E5=90=8D?=
 =?UTF-8?q?=E5=AD=90=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/axis/service/impl/PowerAxisStructServiceImpl.java   | 2 +-
 .../axis/service/impl/PowerServiceStationServiceImpl.java       | 2 +-
 .../src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
index 3686754..36c9d6d 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java
@@ -154,7 +154,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
             }
         }
         if (baseDao.countRepeatStructByName(customerId, structDto.getName(), agencyId, structDto.getPid(), structDto.getId()) > NumConstant.ZERO) {
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一组织下不允许存在重名的节点");
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "同一节点下不允许添加同名的子节点");
         }
     }
 
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java
index ad2c5ef..25d9c99 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerServiceStationServiceImpl.java
@@ -64,7 +64,7 @@ public class PowerServiceStationServiceImpl extends BaseServiceImpl<PowerService
         QueryWrapper<PowerServiceStationEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id)
                 .eq(StringUtils.isNotBlank(name), "NAME", name)
-                .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", name);
+                .eq(StringUtils.isNotBlank(axisStructId), "STRUCT_REFERENCE_ID", axisStructId);
 
         return wrapper;
     }
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 c7909b1..dc91855 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
@@ -105,6 +105,7 @@
                 </otherwise>
             </choose>
             <if test="id != null and id != ''">AND s.ID != #{id}</if>
+            <if test="pid != null and pid != ''">AND s.pid = #{pid}</if>
     </select>
     <select id="countRepeatStructByCategory" resultType="java.lang.Integer">
         SELECT