补充判重逻辑

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);
 

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}