数据类型调整

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(), "无法跨级添加节点");
             }

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>
+</mapper>