|
@@ -137,23 +137,23 @@ namespace Hotline.KnowledgeBase
|
|
await _knowledgeRepository.UpdateAsync(knowledge);
|
|
await _knowledgeRepository.UpdateAsync(knowledge);
|
|
break;
|
|
break;
|
|
case WorkflowModuleConsts.KnowledgeUpdate://修改
|
|
case WorkflowModuleConsts.KnowledgeUpdate://修改
|
|
- ////处理知识版本号
|
|
|
|
- ////根据Code查询目前使用的版本号,版本号+1
|
|
|
|
- //var oldKnowledge = await _knowledgeRepository
|
|
|
|
- // .Queryable()
|
|
|
|
- // .Where(p => p.Code == knowledge.Code && p.Status != EKnowledgeStatus.Auditing && p.Status != EKnowledgeStatus.Failed && p.IsDeleted == false)
|
|
|
|
- // .OrderByDescending(p => p.Version)
|
|
|
|
- // .Take(1)
|
|
|
|
- // .FirstAsync();
|
|
|
|
- //if (oldKnowledge == null)
|
|
|
|
- // knowledge.Version = 1;
|
|
|
|
- //else
|
|
|
|
- // knowledge.Version = oldKnowledge.Version + 1;
|
|
|
|
- ////修改知识状态为已上架
|
|
|
|
- //knowledge.Status = EKnowledgeStatus.OnShelf;
|
|
|
|
- //knowledge.OnShelfTime = System.DateTime.Now;
|
|
|
|
- //await _knowledgeRepository.UpdateAsync(knowledge);
|
|
|
|
- await KnowledgeUpdate(knowledge);
|
|
|
|
|
|
+ //处理知识版本号
|
|
|
|
+ //根据Code查询目前使用的版本号,版本号+1
|
|
|
|
+ var oldKnowledge = await _knowledgeRepository
|
|
|
|
+ .Queryable()
|
|
|
|
+ .Where(p => p.Code == knowledge.Code && p.Status != EKnowledgeStatus.Auditing && p.Status != EKnowledgeStatus.Failed && p.IsDeleted == false)
|
|
|
|
+ .OrderByDescending(p => p.Version)
|
|
|
|
+ .Take(1)
|
|
|
|
+ .FirstAsync();
|
|
|
|
+ if (oldKnowledge == null)
|
|
|
|
+ knowledge.Version = 1;
|
|
|
|
+ else
|
|
|
|
+ knowledge.Version = oldKnowledge.Version + 1;
|
|
|
|
+ //修改知识状态为已上架
|
|
|
|
+ knowledge.Status = EKnowledgeStatus.OnShelf;
|
|
|
|
+ knowledge.OnShelfTime = System.DateTime.Now;
|
|
|
|
+ await _knowledgeRepository.UpdateAsync(knowledge);
|
|
|
|
+ // await KnowledgeUpdate(knowledge);
|
|
break;
|
|
break;
|
|
|
|
|
|
case WorkflowModuleConsts.KnowledgeDelete://删除
|
|
case WorkflowModuleConsts.KnowledgeDelete://删除
|
|
@@ -202,6 +202,8 @@ namespace Hotline.KnowledgeBase
|
|
|
|
|
|
_mapper.Map(temp, knowledge);
|
|
_mapper.Map(temp, knowledge);
|
|
knowledge.Id = tempId;
|
|
knowledge.Id = tempId;
|
|
|
|
+
|
|
|
|
+ //修改数据
|
|
await _knowledgeRepository.UpdateAsync(knowledge);
|
|
await _knowledgeRepository.UpdateAsync(knowledge);
|
|
await _knowledgeRepository.UpdateAsync(oldKnowledge);
|
|
await _knowledgeRepository.UpdateAsync(oldKnowledge);
|
|
}
|
|
}
|
|
@@ -213,7 +215,6 @@ namespace Hotline.KnowledgeBase
|
|
knowledge.Version = Version;
|
|
knowledge.Version = Version;
|
|
await _knowledgeRepository.UpdateAsync(knowledge);
|
|
await _knowledgeRepository.UpdateAsync(knowledge);
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|