Merge branch 'dev_guidance' into develop

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/GuideDao.java

@@ -50,12 +50,13 @@ public interface GuideDao extends BaseDao<GuideEntity> {
     /**
      * 指南详情
      *
+     * @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);
 
     /**
      * 收藏列表

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java

@@ -375,7 +375,10 @@ public class GuideServiceImpl extends BaseServiceImpl<GuideDao, GuideEntity> 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();
+        }
         //获取指南内容模块
         result.setModuleList(guideModuleService.getByGuideId(formDTO.getCustomerId(), formDTO.getGuideId()));
         //获取指南附件

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}
     </select>