From 0ba0a8dc9b9eb0ec9852cd44fbff45f19f1a449a Mon Sep 17 00:00:00 2001
From: liu <liujiatong112@163.com>
Date: Fri, 28 Jun 2024 15:05:31 +0800
Subject: [PATCH] bugfix
---
.../controller/knowledge/KnowledgeManageController.java | 4 ++--
.../knowsub/service/impl/KnowledgeManageServiceImpl.java | 7 +++----
.../java/com/supervision/knowsub/model/KnowledgeInfo.java | 4 ----
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java
index f4e1d2f..589f7c0 100644
--- a/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java
+++ b/know_sub_business/src/main/java/com/supervision/knowsub/controller/knowledge/KnowledgeManageController.java
@@ -79,8 +79,8 @@ public class KnowledgeManageController {
@Operation(summary = "删除知识库-逻辑删除")
@GetMapping("deleteKnowledge")
- public void deleteKnowledge(String knowledgeId) {
-
+ public void deleteKnowledge(String knowledgeId,String remark) {
+ knowledgeManageService.deleteKnowledge(knowledgeId,remark);
}
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 74cbb72..73ec487 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
@@ -178,7 +178,6 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
knowledgeService.updateById(knowledge);
// 更新基础信息
KnowledgeInfo knowledgeInfo = reqVO.getKnowledgeInfo();
- Assert.notBlank(knowledgeInfo.getKnowledgeId(), "知识ID不能为空");
// 这里需要用SQL进行更新,不能用封装的updateById,因为前端某些字段可能变为空,用updateById不能让那个想为空的变成空
knowledgeInfoService.lambdaUpdate()
.set(KnowledgeInfo::getPolicyType, knowledgeInfo.getPolicyType())
@@ -190,7 +189,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
.set(KnowledgeInfo::getExecTimeEnd, knowledgeInfo.getExecTimeEnd())
.set(KnowledgeInfo::getTimeliness, knowledgeInfo.getTimeliness())
.set(KnowledgeInfo::getPublishDate, knowledgeInfo.getPublishDate())
- .eq(KnowledgeInfo::getKnowledgeId, knowledgeInfo.getKnowledgeId()).update();
+ .eq(KnowledgeInfo::getId, knowledgeInfo.getId()).update();
// 有可能更新附件
updateKnowledgeFile(reqVO, knowledge);
// 有可能更新URL
@@ -267,7 +266,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
@Override
public KnowledgeDetailResVO queryKnowledgeDetail(String knowledgeId) {
Knowledge knowledge = knowledgeService.getOptById(knowledgeId).orElseThrow(() -> new BusinessException("未找到知识"));
- KnowledgeInfo knowledgeInfo = knowledgeInfoService.lambdaQuery().eq(KnowledgeInfo::getKnowledgeId, knowledgeId).oneOpt().orElse(new KnowledgeInfo());
+ KnowledgeInfo knowledgeInfo = knowledgeInfoService.getOptById(knowledge.getInfoId()).orElse(new KnowledgeInfo());
KnowledgeContext knowledgeContext = knowledgeContextService.getOptById(knowledge.getContentId()).orElse(new KnowledgeContext());
List<KnowledgeLink> knowledgeLinkList = knowledgeLinkService.lambdaQuery().eq(KnowledgeLink::getKnowledgeId, knowledgeId).list();
List<KnowledgeAttachment> knowledgeAttachmentList = knowledgeAttachmentService.lambdaQuery().eq(KnowledgeAttachment::getKnowledgeId, knowledgeId).list();
@@ -286,7 +285,7 @@ public class KnowledgeManageServiceImpl implements KnowledgeManageService {
if (flowRecordService.lambdaQuery().eq(KnowledgeFlowRecord::getKnowledgeId, knowledgeId).count() == 0) {
// 如果没有走过审批的记录,则可以直接删除
knowledgeService.removeById(knowledgeId);
- knowledgeInfoService.lambdaUpdate().eq(KnowledgeInfo::getKnowledgeId, knowledgeId).remove();
+ knowledgeInfoService.removeById(knowledge.getInfoId());
knowledgeContextService.lambdaUpdate().eq(KnowledgeContext::getId, knowledge.getContentId()).remove();
// 删除文件
List<KnowledgeAttachment> list = knowledgeAttachmentService.lambdaQuery().eq(KnowledgeAttachment::getKnowledgeId, knowledgeId).list();
diff --git a/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java
index 8e133f3..51a5aa7 100644
--- a/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java
+++ b/know_sub_model/src/main/java/com/supervision/knowsub/model/KnowledgeInfo.java
@@ -22,10 +22,6 @@ public class KnowledgeInfo implements Serializable {
*/
@TableId
private String id;
-
- @Schema(description = "知识ID")
- private String knowledgeId;
-
/**
* 内容ID
*/