From d99618d4333b241c6a54d36639a2b8f01d2bf0d4 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 6 Apr 2021 14:18:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=91=E9=80=81?= =?UTF-8?q?=E5=88=B0=E7=AC=AC=E4=B8=89=E6=96=B9=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index bebf4654b5..251e86ec57 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2181,12 +2181,12 @@ public class ProjectServiceImpl extends BaseServiceImpl issueDetail = govIssueOpenFeignClient.votingissuedetail(issueDetailFormDTO); - if (!issueDetail.success()) { + if (!issueDetail.success() || null == issueDetail.getData()) { throw new RenException(issueDetail.getCode(), issueDetail.getMsg()); } //获取话题详情 Result topic = resiGroupOpenFeignClient.getTopicById(issueDetail.getData().getTopicInfo().getTopicId()); - if (!topic.success()) { + if (!topic.success() || null == topic.getData()) { throw new RenException(topic.getCode(), topic.getMsg()); } applyAssistFormDTO.setLatitude(topic.getData().getDimension()); @@ -2198,7 +2198,7 @@ public class ProjectServiceImpl extends BaseServiceImpl topicAttachment = resiGroupOpenFeignClient.topicAttachmentList(topicAttachmentFormDTO); - if (!topicAttachment.success()) { + if (!topicAttachment.success() || null == topicAttachment.getData()) { throw new RenException(topicAttachment.getCode(), topicAttachment.getMsg()); } if (CollectionUtils.isNotEmpty(issueDetail.getData().getTopicInfo().getPhotoList())) { From e1bbddcde29aad05b3020a0c5b1291dc104575c3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 7 Apr 2021 13:50:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/{V0.0.8__platform.sql => V0.0.10__platform.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/{V0.0.8__platform.sql => V0.0.10__platform.sql} (100%) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.10__platform.sql similarity index 100% rename from epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.8__platform.sql rename to epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.10__platform.sql