From 97a5d817539978d1f3a9fdfee2f2907d1ef744e4 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Mon, 25 Apr 2022 17:25:20 +0800
Subject: [PATCH] update

---
 .../impl/PowerKernelHouseholdServiceImpl.java       | 13 -------------
 .../mapper/poweraxis/PowerKernelHouseholdDao.xml    |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

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 0a06d63..c8bf90d 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
@@ -6,9 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -22,14 +19,10 @@ import com.epmet.plugin.power.dto.axis.form.PowerKernelHouseHoldViewListFormDTO;
 import com.epmet.plugin.power.dto.axis.form.PowerKernelListPostitionFormDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerKernelHouseHoldViewListResultDTO;
 import com.epmet.plugin.power.dto.axis.result.PowerKernelListPostitionResultDTO;
-import com.epmet.plugin.power.enums.PowerTagCategoryEnum;
 import com.epmet.plugin.power.modules.axis.dao.PowerKernelHouseholdDao;
 import com.epmet.plugin.power.modules.axis.entity.PowerKernelHouseholdEntity;
-import com.epmet.plugin.power.modules.axis.redis.PowerKernelHouseholdRedis;
-import com.epmet.plugin.power.modules.axis.service.PowerAxisTagService;
 import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService;
 import com.google.common.collect.Sets;
-import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,9 +40,6 @@ import java.util.*;
 @Service
 public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernelHouseholdDao, PowerKernelHouseholdEntity> implements PowerKernelHouseholdService {
 
-    @Autowired
-    private PowerKernelHouseholdRedis powerKernelHouseholdRedis;
-
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
 
@@ -59,9 +49,6 @@ public class PowerKernelHouseholdServiceImpl extends BaseServiceImpl<PowerKernel
     @Autowired
     private PowerKernelHouseholdService powerKernelHouseholdService;
 
-    @Autowired
-    private PowerAxisTagService powerAxisTagService;
-
     @Override
     public PageData<PowerKernelHouseholdDTO> page(Map<String, Object> params) {
         IPage<PowerKernelHouseholdEntity> page = baseDao.selectPage(
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 c281065..6687204 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
@@ -90,7 +90,7 @@
     </select>
     <select id="queryHouseIdList" resultType="java.lang.String">
         SELECT
-            HOUSE_ID
+            distinct HOUSE_ID
         FROM
 	        pli_power_kernel_household
 	    <where>