diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java
index 9fc4a6170..7fe65afe8 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/rocketmq/dto/OrganizationModifyDTO.java
@@ -34,4 +34,21 @@ public class OrganizationModifyDTO implements Serializable {
      * 部门类型
      */
     private String typeKey;
+
+    /**
+     * 父所有部门ID
+     */
+    private String parentDeptIds;
+    /**
+     * 父所有部门
+     */
+    private String parentDeptNames;
+    /**
+     * 所有部门ID
+     */
+    private String allDeptIds;
+    /**
+     * 所有部门
+     */
+    private String allDeptNames;
 }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
index af5509ee5..44be59c3c 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/BannerServiceImpl.java
@@ -17,10 +17,10 @@
 
 package com.elink.esua.epdc.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -28,11 +28,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.BannerDao;
 import com.elink.esua.epdc.dto.BannerDTO;
-import com.elink.esua.epdc.dto.NewsUserAttitudeDTO;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcBannerListFromDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcBannerListResultDTO;
@@ -42,7 +40,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.BannerDepartmentService;
 import com.elink.esua.epdc.service.BannerService;
 import com.elink.esua.epdc.util.NewsUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -218,27 +215,47 @@ public class BannerServiceImpl extends BaseServiceImpl<BannerDao, BannerEntity>
         List<BannerEntity> entities = new ArrayList<>();
         for (BannerDTO banner: bannerList) {
             BannerEntity entity = new BannerEntity();
-            if (StringUtils.isNotEmpty(banner.getParentDeptIds()) && StringUtils.isNotEmpty(banner.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(banner.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(banner.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(banner.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(banner.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(banner.getAllDeptIds()) && StringUtils.isNotEmpty(banner.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(banner.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(banner.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(banner.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(banner.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(banner.getParentDeptIds()) && StringUtils.isNotEmpty(banner.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(banner.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(banner.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(banner.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(banner.getAllDeptIds()) && StringUtils.isNotEmpty(banner.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(banner.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(banner.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(banner.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
index 409a84da9..a81cf7df8 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
@@ -515,27 +515,47 @@ public class NewsServiceImpl extends BaseServiceImpl<NewsDao, NewsEntity> implem
         List<NewsEntity> entities = new ArrayList<>();
         for (NewsDTO news: newsList) {
             NewsEntity entity = new NewsEntity();
-            if (StringUtils.isNotEmpty(news.getParentDeptIds()) && StringUtils.isNotEmpty(news.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(news.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(news.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(news.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(news.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(news.getAllDeptIds()) && StringUtils.isNotEmpty(news.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(news.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(news.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(news.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(news.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(news.getParentDeptIds()) && StringUtils.isNotEmpty(news.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(news.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(news.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(news.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(news.getAllDeptIds()) && StringUtils.isNotEmpty(news.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(news.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(news.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(news.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }
diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
index a95324054..3668bf8da 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java
@@ -17,10 +17,10 @@
 
 package com.elink.esua.epdc.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
@@ -28,7 +28,6 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dao.NoticeDao;
 import com.elink.esua.epdc.dto.NoticeDTO;
@@ -44,7 +43,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.service.NoticeDepartmentService;
 import com.elink.esua.epdc.service.NoticeService;
 import com.elink.esua.epdc.util.NewsUtils;
-import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -259,27 +257,47 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         List<NoticeEntity> entities = new ArrayList<>();
         for (NoticeDTO notice: noticeList) {
             NoticeEntity entity = new NoticeEntity();
-            if (StringUtils.isNotEmpty(notice.getParentDeptIds()) && StringUtils.isNotEmpty(notice.getParentDeptNames())) {
-                List<String> parentDeptIds = Arrays.asList(notice.getParentDeptIds().split(","));
-                List<String> parentDeptNames = Arrays.asList(notice.getParentDeptNames().split("-"));
-                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && parentDeptNames.size() > index) {
-                    parentDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(notice.getId());
-                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
-                }
+            if("grid_party".equals(dto.getTypeKey())) {
+                entity.setId(notice.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds());
+                entity.setAllDeptNames(dto.getAllDeptNames());
+                entity.setParentDeptIds(dto.getParentDeptIds());
+                entity.setParentDeptNames(dto.getParentDeptNames());
             }
-
-            if (StringUtils.isNotEmpty(notice.getAllDeptIds()) && StringUtils.isNotEmpty(notice.getAllDeptNames())) {
+            if("community_party".equals(dto.getTypeKey())) {
                 List<String> allDeptIds = Arrays.asList(notice.getAllDeptIds().split(","));
                 List<String> allDeptNames = Arrays.asList(notice.getAllDeptNames().split("-"));
                 int index = allDeptIds.indexOf(dto.getDeptId().toString());
-                if (index >= 0 && allDeptNames.size() > index) {
-                    allDeptNames.set(index, dto.getNewDeptName());
-                    entity.setId(notice.getId());
-                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
-                }
+                String gridName = allDeptNames.get(index + 1);
+                String girdId = allDeptIds.get(index + 1);
+                entity.setId(notice.getId());
+                entity.setAllDeptIds(dto.getAllDeptIds() + "," + girdId);
+                entity.setAllDeptNames(dto.getAllDeptNames() + "-" + gridName);
+                entity.setParentDeptIds(dto.getAllDeptIds());
+                entity.setParentDeptNames(dto.getAllDeptNames());
+
             }
+//            if (StringUtils.isNotEmpty(notice.getParentDeptIds()) && StringUtils.isNotEmpty(notice.getParentDeptNames())) {
+//                List<String> parentDeptIds = Arrays.asList(notice.getParentDeptIds().split(","));
+//                List<String> parentDeptNames = Arrays.asList(notice.getParentDeptNames().split("-"));
+//                int index = parentDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && parentDeptNames.size() > index) {
+//                    parentDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(notice.getId());
+//                    entity.setParentDeptNames(StringUtils.join(parentDeptNames, "-"));
+//                }
+//            }
+//
+//            if (StringUtils.isNotEmpty(notice.getAllDeptIds()) && StringUtils.isNotEmpty(notice.getAllDeptNames())) {
+//                List<String> allDeptIds = Arrays.asList(notice.getAllDeptIds().split(","));
+//                List<String> allDeptNames = Arrays.asList(notice.getAllDeptNames().split("-"));
+//                int index = allDeptIds.indexOf(dto.getDeptId().toString());
+//                if (index >= 0 && allDeptNames.size() > index) {
+//                    allDeptNames.set(index, dto.getNewDeptName());
+//                    entity.setId(notice.getId());
+//                    entity.setAllDeptNames(StringUtils.join(allDeptNames, "-"));
+//                }
+//            }
 
             entities.add(entity);
         }