diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java index 0555fbe..e2063a5 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructLeaderServiceImpl.java @@ -120,7 +120,7 @@ public class PowerAxisStructLeaderServiceImpl extends BaseServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(PowerAxisStructEntity::getCustomerId, customerId) - .eq(PowerAxisStructEntity::getPid, axisStructId) + .eq(PowerAxisStructEntity::getId, axisStructId) .eq(PowerAxisStructEntity::getDelFlag, EpmetDelFlagEnum.NORMAL.value()); PowerAxisStructEntity axisStructEntity = powerAxisStructDao.selectOne(lqw); 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 891c126..1680762 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 @@ -159,12 +159,12 @@ leader.NAME AS leaderName FROM pli_power_axis_struct AS struct - LEFT JOIN pli_power_axis_struct_leader AS sl ON struct.id = sl.STRUCT_REFERENCE_ID - LEFT JOIN pli_power_axis_leader AS leader ON sl.LEADER_ID = leader.id + LEFT JOIN pli_power_axis_struct_leader AS sl ON struct.id = sl.STRUCT_REFERENCE_ID and sl.DEL_FLAG = '0' + LEFT JOIN pli_power_axis_leader AS leader ON sl.LEADER_ID = leader.id and leader.DEL_FLAG = '0' WHERE - struct.agency_id = #{agencyId} - AND - struct.customer_id = #{customerId} + struct.DEL_FLAG = '0' + AND struct.agency_id = #{agencyId} + AND struct.customer_id = #{customerId}