Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2020-12-03 f423b64de6526469489ac0018aa8d3fe538dcefa

Merge branch 'outcenter' of https://gitee.com/chonggaoxiao/new_excoin into outcenter

 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);
    }