From 35f133b5915812a93f9b02447e24e59de78a47c6 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 28 Jul 2022 17:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../axis/service/impl/PowerAxisStructServiceImpl.java       | 1 +
 .../main/resources/mapper/poweraxis/PowerAxisStructDao.xml  | 6 +++---
 2 files changed, 4 insertions(+), 3 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 531b61b..fe1f100 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
@@ -145,6 +145,7 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl<PowerAxisStructD
             }
         } else {
             Integer parentStructLevel = powerAxisTagService.selectStructLevelById(customerId, PowerTagCategoryEnum.STRUCT.category(), structDto.getPid());
+            parentStructLevel = parentStructLevel == null?0:parentStructLevel;
             if (structLevel - parentStructLevel.intValue() > NumConstant.ONE) {
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "无法跨级添加节点");
             }
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 3db8a0e..8be24a9 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
@@ -89,7 +89,7 @@
         </where>
     </select>
 
-    <select id="countRepeatStructByName" resultType="java.lang.Integer">
+    <select id="countRepeatStructByName" resultType="int">
         SELECT
         count(*)
         FROM
@@ -108,7 +108,7 @@
         <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 id="countRepeatStructByCategory" resultType="int">
         SELECT
         count(*)
         FROM
@@ -259,4 +259,4 @@
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>