From f423b64de6526469489ac0018aa8d3fe538dcefa Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Thu, 03 Dec 2020 14:54:26 +0800 Subject: [PATCH] Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin into outcenter --- src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java | 38 +++++++++++++++++++++++--------------- 1 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java b/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java index bf2b41b..52cdb42 100644 --- a/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/helpCenter/service/impl/HelpCenterServiceImpl.java @@ -219,21 +219,29 @@ @Override public Result getAboutUs() { NoticeInfoVo noticeInfoVo = new NoticeInfoVo(); - HelpCenterArticleEntity selectById = helpCenterArticleDao.selectById(27); - if(ObjectUtil.isNotEmpty(selectById)) { - String createBy = selectById.getCreateBy(); - noticeInfoVo.setCreateBy(createBy); - - String content = selectById.getContent(); - noticeInfoVo.setContent(content); - Date createTime = selectById.getCreateTime(); - noticeInfoVo.setCreateTime(createTime); - String title = selectById.getTitle(); - noticeInfoVo.setTitle(title); - int typeLanguage = selectById.getTypeLanguage(); - noticeInfoVo.setTypeLanguage(typeLanguage); - Long id = selectById.getId(); - noticeInfoVo.setId(id); + //获取对应的【帮助中心公告】 + Map<String, Object> columnMap = new HashMap<String, Object>(); + columnMap.put("article_notice", "3"); + List<HelpCenterNoticeEntity> helpCenterNoticeEntitys = helpCenterNoticeDao.selectByMap(columnMap); + if(CollUtil.isNotEmpty(helpCenterNoticeEntitys)) { + HelpCenterNoticeEntity helpCenterNoticeEntity = helpCenterNoticeEntitys.get(0); + Long articleId = helpCenterNoticeEntity.getArticleId(); + HelpCenterArticleEntity selectById = helpCenterArticleDao.selectById(articleId); + if(ObjectUtil.isNotEmpty(selectById)) { + String createBy = selectById.getCreateBy(); + noticeInfoVo.setCreateBy(createBy); + + String content = selectById.getContent(); + noticeInfoVo.setContent(content); + Date createTime = selectById.getCreateTime(); + noticeInfoVo.setCreateTime(createTime); + String title = selectById.getTitle(); + noticeInfoVo.setTitle(title); + int typeLanguage = selectById.getTypeLanguage(); + noticeInfoVo.setTypeLanguage(typeLanguage); + Long id = selectById.getId(); + noticeInfoVo.setId(id); + } } return Result.ok(noticeInfoVo); } -- Gitblit v1.9.1