diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
index 6954f078..73726a5b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/IssueServiceImpl.java
@@ -202,6 +202,7 @@ public class IssueServiceImpl implements IssueService {
     @Override
     public Result submitVeterantopic(TokenDto userDetail, VeteranTopicDTO dto) {
         dto.setUserId(userDetail.getUserId());
+        dto.setGridId(userDetail.getGridId());
         dto.setUserFace(userDetail.getFaceImg());
         dto.setMobile(userDetail.getMobile());
         return issueFeignClient.submitVeterantopic(dto);
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
index 3c293668..c19c375a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
@@ -165,10 +165,10 @@
                 <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/js_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e4l333jb61be50n3o.mysql.rds.aliyuncs.com:3306/esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>jinshui_epdc_test</spring.datasource.druid.username>
-                <spring.datasource.druid.password>jinshui@833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>epdc_root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>epdc@jinshui888</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java
index 5ce7e37b..5a86d35c 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/VeteranTopicController.java
@@ -104,7 +104,7 @@ public class VeteranTopicController {
      * @Version1.0
      **/
     @PostMapping("submitVeterantopic")
-    public Result submit(@RequestBody VeteranTopicDTO dto){
+    public Result submit(@RequestBody VeteranTopicDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         veteranTopicService.save(dto);
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java
index 1e1a6b9b..0e43b12b 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/VeteranTopicServiceImpl.java
@@ -22,15 +22,18 @@ 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.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllDeptDTO;
 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.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.dto.events.VeteranTopicDTO;
 import com.elink.esua.epdc.dto.issue.form.VeteranFormDTO;
 import com.elink.esua.epdc.dto.issue.result.IssueResultDTO;
 import com.elink.esua.epdc.modules.events.dao.VeteranTopicDao;
 import com.elink.esua.epdc.modules.events.entity.VeteranTopicEntity;
 import com.elink.esua.epdc.modules.events.service.VeteranTopicService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -49,6 +52,9 @@ import java.util.Map;
 @Service
 public class VeteranTopicServiceImpl extends BaseServiceImpl<VeteranTopicDao, VeteranTopicEntity> implements VeteranTopicService {
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public PageData<VeteranTopicDTO> page(Map<String, Object> params) {
         IPage<VeteranTopicEntity> page = baseDao.selectPage(
@@ -65,8 +71,8 @@ public class VeteranTopicServiceImpl extends BaseServiceImpl<VeteranTopicDao, Ve
         return ConvertUtils.sourceToTarget(entityList, VeteranTopicDTO.class);
     }
 
-    private QueryWrapper<VeteranTopicEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<VeteranTopicEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<VeteranTopicEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -83,6 +89,16 @@ public class VeteranTopicServiceImpl extends BaseServiceImpl<VeteranTopicDao, Ve
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(VeteranTopicDTO dto) {
+
+        Result<ParentAndAllDeptDTO> parentAndAllDept = adminFeignClient.getParentAndAllDept(dto.getGridId());
+        ParentAndAllDeptDTO data = parentAndAllDept.getData();
+        if (null != data) {
+            dto.setGrid(dto.getGrid());
+            dto.setAllDeptNames(data.getAllDeptNames());
+            dto.setAllDeptIds(data.getAllDeptIds());
+            dto.setParentDeptNames(data.getParentDeptNames());
+            dto.setParentDeptIds(data.getParentDeptIds());
+        }
         VeteranTopicEntity entity = ConvertUtils.sourceToTarget(dto, VeteranTopicEntity.class);
         insert(entity);
     }