diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java index 2195d89..250a4f8 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/controller/PowerAxisStructController.java @@ -119,24 +119,6 @@ public class PowerAxisStructController { return new Result(); } - /** - * 获取上级网格党支部 - */ - @PostMapping("/GridPartyBranchList") - public Result> getGridPartyBranchList() { - List list = powerAxisStructService.getGridPartyBranchList(); - return new Result>().ok(list); - } - - /** - * 获取上级组织 - */ - @PostMapping("/getPartyCommList") - public Result> getPartyCommList() { - List list = powerAxisStructService.getPartyCommList(); - return new Result>().ok(list); - } - /** * 根据节点接报,组装其上级节点树 * diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java index 691fef9..32ab682 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/dao/PowerAxisStructDao.java @@ -40,16 +40,6 @@ public interface PowerAxisStructDao extends BaseDao { void delete(String id); - /** - * 获取上级网格党支部 - */ - List getGridPartyBranchList(String customerId); - - /** - * 获取上级党委 - */ - List getPartyCommList(String customerId); - /** * 查询同组织下是否有同名的节点 * diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java index 59ac9fd..d1910a7 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/PowerAxisStructService.java @@ -101,16 +101,6 @@ public interface PowerAxisStructService extends BaseService getGridPartyBranchList(); - - /** - * 获取上级党委列表 - */ - List getPartyCommList(); - /** * 根据id查询修改表单数据 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java index 2e7cc28..af51fe0 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/axis/service/impl/PowerAxisStructServiceImpl.java @@ -211,23 +211,6 @@ public class PowerAxisStructServiceImpl extends BaseServiceImpl getGridPartyBranchList() { - String customerId = loginUserUtil.getLoginUserCustomerId(); - List list = baseDao.getGridPartyBranchList(customerId); - return list; - } - - @Override - public List getPartyCommList() { - String customerId = loginUserUtil.getLoginUserCustomerId(); - List list = baseDao.getPartyCommList(customerId); - return list; - } - @Override public PowerAxisStructEntity queryModifyById(String id) { PowerAxisStructEntity entity = baseDao.selectById(id); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml index d5f8021..55ba437 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/poweraxis/PowerAxisStructDao.xml @@ -88,34 +88,6 @@ - -