diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleAgencyGridListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleAgencyGridListResultDTO.java
new file mode 100644
index 0000000000..dd84877e56
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ArticleAgencyGridListResultDTO.java
@@ -0,0 +1,42 @@
+/**
+ * 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.ArrayList;
+import java.util.List;
+
+
+/**
+ * 党建声音-可选发布范围、可下线网格列表-接口返参
+ *
+ * @author sun
+ */
+@Data
+public class ArticleAgencyGridListResultDTO implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 树结构对象
+ */
+ private ArticleGridResultDTO agencyGridList;
+
+}
\ 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 c00846c8eb..929ecccfe9 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
@@ -64,8 +64,10 @@ public class ArticleController {
* @Description 党建声音-政府端-可选发布范围
**/
@PostMapping("agencygridlist")
- public Result agencyGridList(@LoginUser TokenDto tokenDTO) {
- return new Result().ok(articleService.agencyGridList(tokenDTO));
+ public Result agencyGridList(@LoginUser TokenDto tokenDTO) {
+ ArticleAgencyGridListResultDTO agencyGridList = new ArticleAgencyGridListResultDTO();
+ agencyGridList.setAgencyGridList(articleService.agencyGridList(tokenDTO));
+ return new Result().ok(agencyGridList);
}
/**
@@ -298,10 +300,12 @@ public class ArticleController {
* @Description 党建声音-政府端-可下线网格列表
**/
@PostMapping("publishgridlist")
- public Result publishGridList(@LoginUser TokenDto tokenDTO, @RequestBody PublishGridListFormDTO formDTO) {
+ public Result publishGridList(@LoginUser TokenDto tokenDTO, @RequestBody PublishGridListFormDTO formDTO) {
formDTO.setStaffId(tokenDTO.getUserId());
ValidatorUtils.validateEntity(formDTO, PublishGridListFormDTO.AddUserInternalGroup.class);
- return new Result().ok(articleService.publishGridList(formDTO));
+ ArticleAgencyGridListResultDTO agencyGridList = new ArticleAgencyGridListResultDTO();
+ agencyGridList.setAgencyGridList(articleService.publishGridList(formDTO));
+ return new Result().ok(agencyGridList);
}