From f0af01bec7673009da3e31404613e186335db7e9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 9 Sep 2021 17:26:48 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8C=87=E5=8D=97=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/GuideServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java index 5ff3c79d6d..75e6210ff2 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java @@ -376,6 +376,9 @@ public class GuideServiceImpl extends BaseServiceImpl imp public GuideDetailResultDTO guideDetail(GuideFormDTO formDTO) { //获取指南详情 GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getGuideId()); + if (null == result) { + result = new GuideDetailResultDTO(); + } //获取指南内容模块 result.setModuleList(guideModuleService.getByGuideId(formDTO.getCustomerId(), formDTO.getGuideId())); //获取指南附件 From 927687d69887c973ae1eed76afebd1821b9f7770 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 9 Sep 2021 17:37:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8C=87=E5=8D=97=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java | 3 ++- .../src/main/java/com/epmet/service/impl/GuideServiceImpl.java | 2 +- .../gov-voice-server/src/main/resources/mapper/GuideDao.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java index 77d3f6e805..18644f0249 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java @@ -50,12 +50,13 @@ public interface GuideDao extends BaseDao { /** * 指南详情 * + * @Param customerId * @Param guideId * @Return {@link GuideDetailResultDTO} * @Author zhaoqifeng * @Date 2021/9/8 9:59 */ - GuideDetailResultDTO getGuideDetail(@Param("guideId") String guideId); + GuideDetailResultDTO getGuideDetail(@Param("customerId") String customerId, @Param("guideId") String guideId); /** * 收藏列表 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java index 75e6210ff2..6bfbb59e41 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java @@ -375,7 +375,7 @@ public class GuideServiceImpl extends BaseServiceImpl imp @Override public GuideDetailResultDTO guideDetail(GuideFormDTO formDTO) { //获取指南详情 - GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getGuideId()); + GuideDetailResultDTO result = baseDao.getGuideDetail(formDTO.getCustomerId(), formDTO.getGuideId()); if (null == result) { result = new GuideDetailResultDTO(); } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml index e88ab6e889..a850719121 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/GuideDao.xml @@ -54,7 +54,7 @@ gc.CATEGORY_NAME FROM guide g - INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE + INNER JOIN guide_category gc ON g.CATEGORY_CODE = gc.CATEGORY_CODE AND gc.CUSTOMER_ID = #{customerId} WHERE g.ID = #{guideId}