From 232b188942d1708d1c683a96b693635023df5981 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Mon, 12 Aug 2024 10:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/service/impl/IssueServiceImpl.java | 10 ++++++---- .../elink/esua/epdc/dto/events/VeteranTopicDTO.java | 2 +- .../elink/esua/epdc/dto/issue/form/VeteranFormDTO.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) 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 60312cee..4360a83a 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 @@ -201,11 +201,13 @@ public class IssueServiceImpl implements IssueService { @Override public Result submitVeterantopic(TokenDto userDetail, VeteranTopicDTO dto) { - dto.setUserId(userDetail.getUserId()); + if(dto.getType() != "3"){ + dto.setUserId(userDetail.getUserId()); + dto.setUserFace(userDetail.getFaceImg()); + dto.setMobile(userDetail.getMobile()); + dto.setNickName(userDetail.getNickname()); + } 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-client/src/main/java/com/elink/esua/epdc/dto/events/VeteranTopicDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/VeteranTopicDTO.java index 1751f952..0f810aa3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/VeteranTopicDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/VeteranTopicDTO.java @@ -135,7 +135,7 @@ public class VeteranTopicDTO implements Serializable { /** - * 类型 1 老兵 2 阳光信访 + * 类型 1 老兵 2 阳光信访 3 人民整集意见 */ private String type; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java index c1f4b89f..2bf41408 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/issue/form/VeteranFormDTO.java @@ -47,7 +47,7 @@ public class VeteranFormDTO implements Serializable { /** - * 类型 1 老兵 2 阳光信访 + * 类型 1 老兵 2 阳光信访 3 人民征集意见 */ private String type; }