append

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

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>