From 0d7edbaf25cadfe1a24345610e7dd9040aeb2909 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Thu, 28 Apr 2022 09:22:04 +0800
Subject: [PATCH] append

---
 .../power/modules/axis/dao/PowerKernelHouseholdDao.java    | 4 +++-
 .../resources/mapper/poweraxis/PowerKernelHouseholdDao.xml | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
index 4e12468..1509ff5 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerKernelHouseholdDao.java
@@ -47,7 +47,9 @@ public interface PowerKernelHouseholdDao extends BaseDao<PowerKernelHouseholdEnt
 
     List<String> queryIds(String customerId, String axisStructId);
 
-    List<PowerKernelListPostitionResultDTO> queryListPosition(String axisStructId, String customerId, int limit);
+    List<PowerKernelListPostitionResultDTO> queryListPosition(@Param("axisStructId") String axisStructId,
+                                                              @Param("customerId") String customerId,
+                                                              @Param("limit") int limit);
 
 
     List<PowerKernelHouseholdDTO> getPage(Map<String, Object> params);
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
index cf8f403..39fa97e 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerKernelHouseholdDao.xml
@@ -113,7 +113,7 @@
     <select id="queryListPosition"
             resultType="com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO">
             SELECT
-                h.id AS houseId,
+                h.HOUSE_ID AS houseId,
                 h.longitude,
                 h.latitude,
                 h.address
@@ -123,9 +123,10 @@
             WHERE
                 s.DEL_FLAG = '0'
                 AND h.CUSTOMER_ID = #{customerId}
-                AND h.STRUCT_REFERENCE_ID LIKE '%${axisStructId}%'
+                AND STRUCT_REFERENCE_ID in
+                (select DISTINCT s.id from pli_power_axis_struct s where  (s.ID = #{axisStructId} or s.PIDS like '%${axisStructId}%') and s.del_flag = '0')
             GROUP BY
-                h.id
+                h.HOUSE_ID
             ORDER BY
                 s.SORT
     </select>