From b597fc8c6c7c7ce252f9e59ec7319b9c284c65e4 Mon Sep 17 00:00:00 2001 From: liu Date: Mon, 1 Jul 2024 13:03:13 +0800 Subject: [PATCH] bugfix --- .../entity/vo/knowledge/KnowledgeDetailResVO.java | 14 ++++++++++++++ .../service/impl/KnowledgeManageServiceImpl.java | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java b/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java index bfd27c9..07fa41a 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/entity/vo/knowledge/KnowledgeDetailResVO.java @@ -22,4 +22,18 @@ public class KnowledgeDetailResVO { private List knowledgeLinkList; private List fileInfoList; + + private String publishDept; + + private String submittedDeptName; + + private String baseName; + + public KnowledgeDetailResVO(Knowledge knowledge, KnowledgeInfo knowledgeInfo, KnowledgeContext knowledgeContext, List knowledgeLinkList, List fileInfoList) { + this.knowledge = knowledge; + this.knowledgeInfo = knowledgeInfo; + this.knowledgeContext = knowledgeContext; + this.knowledgeLinkList = knowledgeLinkList; + this.fileInfoList = fileInfoList; + } } diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java index 2af2f5c..948a538 100644 --- a/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java +++ b/know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeManageServiceImpl.java @@ -276,7 +276,12 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService { List knowledgeAttachmentList = knowledgeAttachmentService.lambdaQuery().eq(KnowledgeAttachment::getKnowledgeId, knowledgeId).list(); List fileIdList = knowledgeAttachmentList.stream().map(KnowledgeAttachment::getFileId).toList(); List fileInfos = fileService.listByFileId(fileIdList); - return new KnowledgeDetailResVO(knowledge, knowledgeInfo, knowledgeContext, knowledgeLinkList, fileInfos); + // 查看详情的时候,需要返回相应的库名和部门名称 + KnowledgeDetailResVO knowledgeDetailResVO = new KnowledgeDetailResVO(knowledge, knowledgeInfo, knowledgeContext, knowledgeLinkList, fileInfos); + knowledgeDetailResVO.setBaseName(systemBaseService.getOptById(knowledge.getBaseId()).map(SystemBase::getBaseName).orElse("未知子库")); + knowledgeDetailResVO.setSubmittedDeptName(systemDeptService.getOptById(knowledge.getSubmittedDeptId()).map(SystemDept::getDeptName).orElse("未知部门")); + knowledgeDetailResVO.setPublishDept(systemDeptService.getOptById(knowledge.getPublishDeptId()).map(SystemDept::getDeptName).orElse("未知部门")); + return knowledgeDetailResVO; } @Override