diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
index 7d83aef..46166db 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
@@ -12,6 +12,14 @@
jar
+
+
+
+ com.epmet
+ gov-org-client
+ 2.0.0
+
+
com.epmet
epmet-plugins-common
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java
index a895147..f3ce6cf 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerKernelHouseholdController.java
@@ -3,6 +3,7 @@ package com.epmet.plugin.power.modules.axis.controller;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.user.LoginUserUtil;
import com.epmet.commons.tools.utils.ExcelUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
@@ -10,6 +11,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
+import com.epmet.feign.GovOrgOpenFeignClient;
import com.epmet.plugin.power.dto.axis.PowerKernelHouseholdDTO;
import com.epmet.plugin.power.modules.axis.excel.PowerKernelHouseholdExcel;
import com.epmet.plugin.power.modules.axis.service.PowerKernelHouseholdService;
@@ -34,6 +36,12 @@ public class PowerKernelHouseholdController {
@Autowired
private PowerKernelHouseholdService powerKernelHouseholdService;
+ @Autowired
+ private GovOrgOpenFeignClient govOrgOpenFeignClient;
+
+ @Autowired
+ private LoginUserUtil loginUserUtil;
+
@RequestMapping("page")
public Result> page(@RequestParam Map params){
PageData page = powerKernelHouseholdService.page(params);
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml
index dbb638a..1737d89 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/bootstrap.yml
@@ -82,7 +82,7 @@ mybatis-plus:
#数据库相关配置
db-config:
#主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
+ id-type: ASSIGN_ID
#字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
field-strategy: NOT_NULL
#驼峰下划线转换