Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch dev/task-145381 of zentao/zentaopms (#9644)

Browse Source
This commit is contained in:
刘刚
2025-06-18 15:21:16 +08:00
committed by Gitfox
parent 4604e16946 dcbc425e1c
commit f85ecdb59a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+3 -3
View File
@@ -1675,7 +1675,7 @@ class docModel extends model
public function saveDocContent(int $docID, object $docData, int $version, array $files = array()): object
{
/* 获取文档草稿作为要更新的内容。 */
$docContent = $this->getContent($docID, 0);
$docContent = $this->getContent($docID, $version);
if(!$docContent) $docContent = new stdClass();
$docContent->editedBy = $docData->editedBy;
@@ -1736,8 +1736,8 @@ class docModel extends model
$newRawContent = isset($doc->rawContent) ? $doc->rawContent : '';
$onlyRawChanged = $oldRawContent != $newRawContent;
$isDraft = $doc->status == 'draft';
$version = $isDraft ? 0 : ($oldDoc->version + 1);
$changed = $files || $onlyRawChanged || (!$isDraft && $oldDoc->version == 0);
$version = $isDraft ? $oldDoc->version : ($oldDoc->version + 1);
$changed = $files || $onlyRawChanged || (!$isDraft && $oldDoc->status == 'draft');
$basicInfoChanged = false;
foreach($changes as $change)
{