diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java
index 27c71845..558e3c5a 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/IssueFeignClient.java
@@ -122,9 +122,9 @@ public interface IssueFeignClient {
     @GetMapping(value = "events/epdc-app/event/tags", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EventTagsResultDTO>> eventTags();
 
-    @PostMapping(value = "events/epdc-app/event/veterantopic/submitVeterantopic", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "events/veterantopic/submitVeterantopic", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result submitVeterantopic(VeteranTopicDTO dto);
 
-    @GetMapping(value = "events/epdc-app/event/veterantopic/getlistVeteran", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @GetMapping(value = "events/veterantopic/getlistVeteran", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<VeteranTopicDTO>> getlistVeteran(VeteranFormDTO formDto);
 }
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 73726a5b..60312cee 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
@@ -205,6 +205,7 @@ public class IssueServiceImpl implements IssueService {
         dto.setGridId(userDetail.getGridId());
         dto.setUserFace(userDetail.getFaceImg());
         dto.setMobile(userDetail.getMobile());
+        dto.setNickName(userDetail.getNickname());
         return issueFeignClient.submitVeterantopic(dto);
     }
 
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 5a86d35c..a5930ce6 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
@@ -121,7 +121,7 @@ public class VeteranTopicController {
      * @Version1.0
      **/
     @GetMapping("getlistVeteran")
-    public Result<List<VeteranTopicDTO>> getlistVeteran(VeteranFormDTO formDto) {
+    public Result<List<VeteranTopicDTO>> getlistVeteran(@RequestBody VeteranFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
 
         return veteranTopicService.listVeteran(formDto);
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 cc1a1c36..facf6625 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
@@ -76,7 +76,7 @@ public class VeteranTopicServiceImpl extends BaseServiceImpl<VeteranTopicDao, Ve
         String topicContent = (String) params.get("topicContent");
         QueryWrapper<VeteranTopicEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        wrapper.like("TOPIC_CONTENT",topicContent);
+        wrapper.like(StringUtils.isNotBlank(topicContent),"TOPIC_CONTENT",topicContent);
         return wrapper;
     }
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml
index 425dbde0..02cfa73a 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/VeteranTopicDao.xml
@@ -34,6 +34,7 @@
         epdc_veteran_topic
     WHERE
         DEL_FLAG = '0'
+        and EVENT_STATE = '1'
     ORDER BY
         CREATED_TIME DESC
       LIMIT #{pageIndex},#{pageSize}