From ddcbe527ead6a449ce8e7e86756635fd685ab376 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 2 Jun 2020 17:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3-=E6=94=BF?= =?UTF-8?q?=E5=BA=9C=E7=AB=AF-=E5=8F=AF=E9=80=89=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E6=8E=A5=E5=8F=A3=E9=A6=96=E6=AC=A1=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/feign/GovOrgSelfFeignClient.java | 9 ++ .../GovOrgSelfFeignClientFallBack.java | 6 + .../com/epmet/dto/result/AgencyDeptList.java | 44 +++++++ .../com/epmet/dto/result/AgencyGridList.java | 44 +++++++ .../result/PublishAgencyListResultDTO.java | 53 +++++++++ .../controller/CustomerAgencyController.java | 13 ++- .../com/epmet/dao/CustomerDepartmentDao.java | 9 ++ .../java/com/epmet/dao/CustomerGridDao.java | 8 ++ .../epmet/service/CustomerAgencyService.java | 8 ++ .../impl/CustomerAgencyServiceImpl.java | 109 +++++++++++++++--- .../mapper/CustomerDepartmentDao.xml | 17 +++ .../main/resources/mapper/CustomerGridDao.xml | 17 +++ .../epmet/controller/ArticleController.java | 12 ++ .../com/epmet/service/ArticleService.java | 9 ++ .../service/impl/ArticleServiceImpl.java | 13 +++ 15 files changed, 357 insertions(+), 14 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptList.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PublishAgencyListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/GovOrgSelfFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/GovOrgSelfFeignClient.java index 1388593063..7358d0faed 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/GovOrgSelfFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/GovOrgSelfFeignClient.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.feign.fallback.GovOrgSelfFeignClientFallBack; import com.epmet.dto.result.ArticleGridResultDTO; +import com.epmet.dto.result.PublishAgencyListResultDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PathVariable; @@ -25,4 +26,12 @@ public interface GovOrgSelfFeignClient { @PostMapping(value = "gov/org/customeragency/getagencygridlist/{staffId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result getAgencyGridList(@PathVariable("staffId") String staffId); + /** + * @param staffId + * @return + * @Author sun + * @Description 党建声音-政府端-可选发布单位接口调用 + **/ + @PostMapping(value = "gov/org/customeragency/getpublishagencylist/{staffId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result getPublishAgencyList(@PathVariable("staffId") String staffId); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/fallback/GovOrgSelfFeignClientFallBack.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/fallback/GovOrgSelfFeignClientFallBack.java index d1210a4f23..655e7359f0 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/fallback/GovOrgSelfFeignClientFallBack.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/feign/fallback/GovOrgSelfFeignClientFallBack.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.feign.GovOrgSelfFeignClient; import com.epmet.dto.result.ArticleGridResultDTO; +import com.epmet.dto.result.PublishAgencyListResultDTO; import org.springframework.stereotype.Component; /** @@ -18,4 +19,9 @@ public class GovOrgSelfFeignClientFallBack implements GovOrgSelfFeignClient { public Result getAgencyGridList(String staffId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAgencyGridList", staffId); } + + @Override + public Result getPublishAgencyList(String staffId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getPublishAgencyList", staffId); + } } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptList.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptList.java new file mode 100644 index 0000000000..c678c1a723 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyDeptList.java @@ -0,0 +1,44 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 添加组织-接口返参 + * + * @author sun + */ +@Data +public class AgencyDeptList implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 部门Id + */ + private String departmentId = ""; + /** + * 机关-部门名称 + */ + private String agencyDeptName = ""; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java new file mode 100644 index 0000000000..ad2c907fd5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencyGridList.java @@ -0,0 +1,44 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 添加组织-接口返参 + * + * @author sun + */ +@Data +public class AgencyGridList implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格Id + */ + private String gridId = ""; + /** + * 机关-网格名称 + */ + private String agencyGridName = ""; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PublishAgencyListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PublishAgencyListResultDTO.java new file mode 100644 index 0000000000..baa54e8f73 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/PublishAgencyListResultDTO.java @@ -0,0 +1,53 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * 党建声音-可选发布单位-接口返参 + * + * @author sun + */ +@Data +public class PublishAgencyListResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 机关组织Id + */ + private String agencyId = ""; + /** + * 机关组织名称 + */ + private String agencyName = ""; + /** + * 机关下部门列表信息 + */ + private List agencyDeptList; + /** + * 机关下网格列表信息 + */ + private List agencyGridList; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 5c6d37a701..0c254f904d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -169,9 +169,20 @@ public class CustomerAgencyController { * @Author sun * @Description 党建声音-政府端-可选发布范围接口调用-根据人员角色查询对应的不同发布范围 **/ - @PostMapping("getagencygridlist/{agencyId}") + @PostMapping("getagencygridlist/{staffId}") public Result getAgencyGridList(@PathVariable("staffId") String staffId) { return new Result().ok(customerAgencyService.getAgencyGridList(staffId)); } + /** + * @param staffId + * @return + * @Author sun + * @Description 党建声音-政府端-可选发布范围接口调用-根据人员角色查询对应的不同发布范围 + **/ + @PostMapping("getpublishagencylist/{staffId}") + public Result getPublishAgencyList(@PathVariable("staffId") String staffId) { + return new Result().ok(customerAgencyService.getPublishAgencyList(staffId)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java index 13cb1da0ea..2debda4fce 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerDepartmentDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerDepartmentDTO; import com.epmet.dto.CustomerIdDTO; +import com.epmet.dto.result.AgencyDeptList; import com.epmet.dto.result.DepartmentListResultDTO; import com.epmet.dto.result.SubListResultDTO; import com.epmet.entity.CustomerDepartmentEntity; @@ -75,4 +76,12 @@ public interface CustomerDepartmentDao extends BaseDao * @Description 批量查询部门信息 **/ List selectDeptListByIds(@Param("deptIdList") List deptIdList); + + /** + * @param agencyId + * @return + * @Author sun + * @Description 查询机关下部门列表信息 + **/ + List selectAgencyDeptMsgList(@Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 2f2fd75797..86303b5b28 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -192,4 +192,12 @@ public interface CustomerGridDao extends BaseDao { * @Description 查询组织下网格列表 **/ List selectAgencyGridList(@Param("agencyId") String agencyId); + + /** + * @param agencyId + * @return + * @Author sun + * @Description 查询机关下网格列表信息 + **/ + List selectAgencyGridMsgList(@Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index bbd40017b2..eaf18432ad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -164,4 +164,12 @@ public interface CustomerAgencyService extends BaseService * @Description 党建声音-政府端-可选发布范围接口调用-根据人员角色查询对应的不同发布范围 **/ ArticleGridResultDTO getAgencyGridList(String staffId); + + /** + * @param staffId + * @return + * @Author sun + * @Description 党建声音-政府端-可选发布单位接口调用-根据人员角色查询对应的不同发布单位 + **/ + PublishAgencyListResultDTO getPublishAgencyList(String staffId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 45f234258d..26ff3d0358 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -640,52 +640,55 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl> listResult = epmetUserSelfFeignClient.getCustomerStaffRoleList(formDTO); - if(null==listResult.getData()||listResult.getData().size() RoleList = listResult.getData(); //3:判断用户是否具有机关党建负责人或网格指导员角色 - boolean party = false;//机关党建负责人角色 - boolean gridParty = false;//网格指导员角色 - for(CustomerStaffRoleListResultDTO role : RoleList){ - if(CustomerAgencyConstant.PARTY_PRINCIPALS.equals(role.getRoleKey())){ + //机关党建负责人角色 + boolean party = false; + //网格指导员角色 + boolean gridParty = false; + for (CustomerStaffRoleListResultDTO role : RoleList) { + if (CustomerAgencyConstant.PARTY_PRINCIPALS.equals(role.getRoleKey())) { party = true; } - if(CustomerAgencyConstant.GRID_PARTY_DIRECTOR.equals(role.getRoleKey())){ + if (CustomerAgencyConstant.GRID_PARTY_DIRECTOR.equals(role.getRoleKey())) { gridParty = true; } } - if(!party&&!gridParty){ + if (!party && !gridParty) { return returnDTO; } //4:根据不同角色查询不同数据 - if(party){ + CustomerAgencyEntity agencyEntity = baseDao.selectById(staffAgencyDTO.getAgencyId()); + if (party) { //4.1:查询当前机关的网格列表以及所有下级机关的网格列表 + //当前机关信息 + returnDTO.setAgencyId(agencyEntity.getId()); + returnDTO.setAgencyName(agencyEntity.getOrganizationName()); //当前机关下网格列表 List gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); returnDTO.setGridList(gridList); //递归查询当前组织的下级组织以及每个下级组织对应的网格列表 List subAgencyGridList = getGridList(agencyEntity.getPids() + ":" + agencyEntity.getId()); returnDTO.setSubAgencyGridList(subAgencyGridList); - }else if(gridParty){ + } else if (gridParty) { //4.2:查询人员在当前机关下参与的网格列表 //查询当前组织下的网格列表 List gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); @@ -722,5 +725,85 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl> listResult = epmetUserSelfFeignClient.getCustomerStaffRoleList(formDTO); + if (null == listResult.getData() || listResult.getData().size() < NumConstant.ONE) { + return returnDTO; + } + List RoleList = listResult.getData(); + + //3:判断用户是否具有机关党建负责人或网格指导员角色 + //机关党建负责人角色 + boolean party = false; + //网格指导员角色 + boolean gridParty = false; + for (CustomerStaffRoleListResultDTO role : RoleList) { + if (CustomerAgencyConstant.PARTY_PRINCIPALS.equals(role.getRoleKey())) { + party = true; + } + if (CustomerAgencyConstant.GRID_PARTY_DIRECTOR.equals(role.getRoleKey())) { + gridParty = true; + } + } + if (!party && !gridParty) { + return returnDTO; + } + + //4:根据不同角色查询不同数据 + CustomerAgencyEntity agencyEntity = baseDao.selectById(staffAgencyDTO.getAgencyId()); + if (party) { + //4.1:查询当前机关的网格列表以及所有下级机关的网格列表 + //当前机关信息 + returnDTO.setAgencyId(agencyEntity.getId()); + returnDTO.setAgencyName(agencyEntity.getOrganizationName()); + //当前机关下部门列表信息 + List agencyDeptList = customerDepartmentDao.selectAgencyDeptMsgList(agencyEntity.getId()); + returnDTO.setAgencyDeptList(agencyDeptList); + //当前机关下网格列表 + List agencyGridList = customerGridDao.selectAgencyGridMsgList(agencyEntity.getId()); + returnDTO.setAgencyGridList(agencyGridList); + } else if (gridParty) { + //4.2:查询人员在当前机关下参与的网格列表 + //查询当前组织下的网格列表 + List gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); + //查询该工作人员在该客户下参与的网格列表 + CustomerStaffGridDTO staffGridDTO = new CustomerStaffGridDTO(); + staffGridDTO.setCustomerId(staffAgencyDTO.getCustomerId()); + staffGridDTO.setUserId(staffId); + List gridDTOList = customerStaffGridDao.selectStaffGridList(staffGridDTO); + //遍历取出该人员在该组织下参与的网格列表 + List resultList = gridList.stream().flatMap(agencyGrid -> gridDTOList.stream().filter(staffGrid -> + agencyGrid.getGridId().equals(staffGrid.getGridId())).map(grid -> { + AgencyGridList resultDTO = new AgencyGridList(); + resultDTO.setGridId(agencyGrid.getGridId()); + resultDTO.setAgencyGridName(agencyEntity.getOrganizationName() + "-" + agencyGrid.getGridName()); + return resultDTO; + })).collect(Collectors.toList()); + + returnDTO.setAgencyGridList(resultList); + } + + return returnDTO; + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml index 47273d910c..a31747facc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerDepartmentDao.xml @@ -54,4 +54,21 @@ id = #{departmentId} + + \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index cbced7f6d6..11744f7f5a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -329,4 +329,21 @@ WHERE del_flag = '0' AND pid = #{agencyId} + + \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java index ed34ef585d..f1f93005ca 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java @@ -31,6 +31,7 @@ import com.epmet.dto.ArticleDTO; import com.epmet.dto.form.LatestListFormDTO; import com.epmet.dto.result.ArticleGridResultDTO; import com.epmet.dto.result.LatestListResultDTO; +import com.epmet.dto.result.PublishAgencyListResultDTO; import com.epmet.excel.ArticleExcel; import com.epmet.service.ArticleService; import org.springframework.beans.factory.annotation.Autowired; @@ -107,4 +108,15 @@ public class ArticleController { return new Result().ok(articleService.agencyGridList(tokenDTO)); } + /** + * @param tokenDTO + * @return + * @Author sun + * @Description 党建声音-政府端-可选发布单位 + **/ + @PostMapping("publishagencylist") + public Result publishAgencyList(@LoginUser TokenDto tokenDTO) { + return new Result().ok(articleService.publishAgencyList(tokenDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java index 10d6d9adb9..3d0c3ad7d5 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/ArticleService.java @@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.ArticleDTO; import com.epmet.dto.result.ArticleGridResultDTO; +import com.epmet.dto.result.PublishAgencyListResultDTO; import com.epmet.entity.ArticleEntity; import java.util.List; @@ -102,4 +103,12 @@ public interface ArticleService extends BaseService { * @Description 党建声音-政府端-可选发布范围 **/ ArticleGridResultDTO agencyGridList(TokenDto tokenDTO); + + /** + * @param tokenDTO + * @return + * @Author sun + * @Description 党建声音-政府端-可选发布单位 + **/ + PublishAgencyListResultDTO publishAgencyList(TokenDto tokenDTO); } \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index f1ea163a90..cd28c63f23 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.dao.ArticleDao; import com.epmet.dto.ArticleDTO; import com.epmet.dto.feign.GovOrgSelfFeignClient; import com.epmet.dto.result.ArticleGridResultDTO; +import com.epmet.dto.result.PublishAgencyListResultDTO; import com.epmet.entity.ArticleEntity; import com.epmet.redis.ArticleRedis; import com.epmet.service.ArticleService; @@ -120,4 +121,16 @@ public class ArticleServiceImpl extends BaseServiceImpl result = govOrgSelfFeignClient.getPublishAgencyList(tokenDTO.getUserId()); + return result.getData(); + } + } \ No newline at end of file