From 0f45ccba6bbf9102b2767ee93e17d2d0cfbd3899 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 23 Sep 2021 09:46:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=89=8D=E7=BB=84=E7=BB=87=E7=BA=A7?= =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87=E7=BD=91=E6=A0=BC=E9=83=A8?= =?UTF-8?q?=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/GovOrgController.java | 4 ++-- .../epmet/dataaggre/service/govorg/GovOrgService.java | 2 +- .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 9 ++++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 824fab2fae..2f4c4af69d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -174,9 +174,9 @@ public class GovOrgController { * @Date 2021/9/17 14:02 */ @PostMapping("agencytree") - public Result getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) { + public Result> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); - return new Result().ok(govOrgService.getAgencyTree(tokenDto, formDTO)); + return new Result>().ok(govOrgService.getAgencyTree(tokenDto, formDTO)); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 2e2b7c6e88..1bd061569e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -144,5 +144,5 @@ public interface GovOrgService { * @Author zhaoqifeng * @Date 2021/9/17 14:03 */ - OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO); + List getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 45ee6810fe..d6191a0537 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -502,11 +502,14 @@ public class GovOrgServiceImpl implements GovOrgService { * @Date 2021/9/17 14:03 */ @Override - public OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) { + public List getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) { + List list = new ArrayList<>(); if ("resi".equals(formDTO.getClient())) { - return customerAgencyDao.getResiOrgTree(formDTO.getAgencyId()); + list.add(customerAgencyDao.getResiOrgTree(formDTO.getAgencyId())); + return list; } - return customerAgencyDao.getOrgTree(formDTO.getAgencyId()); + list.add(customerAgencyDao.getOrgTree(formDTO.getAgencyId())); + return list; } }