diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java index 9f0e474..6bb4233 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerKernelHouseholdServiceImpl.java @@ -140,7 +140,7 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl houseIdList = form.getHouseIdList(); // 查询已绑定的houseId集合 - List existHouseIdList = baseDao.queryHouseIdList(houseIdList, form.getAxisStructId(), customerId); + List existHouseIdList = baseDao.queryHouseIdList(houseIdList, customerId, form.getAxisStructId()); // 倒序,取差集 for (int i = houseIdList.size() - 1; i >= 0; i--) { if (existHouseIdList.contains(houseIdList.get(i))) { 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 6687204..e57ce77 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 @@ -95,6 +95,7 @@ pli_power_kernel_household del_flag = '0' + AND customer_id = #{customerId} and house_id in @@ -103,8 +104,6 @@ AND STRUCT_REFERENCE_ID = #{axisStructId} - AND - customer_id = #{customerId}