From 250b4914a8b784b96558db554e2dddc60a859a60 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycorp.ltd>
Date: Thu, 27 Jun 2024 14:00:24 +0800
Subject: [PATCH]  * [ticket#1152, doing, 1.5h] Fix history issue.

---
 module/repo/model.php                 | 1 +
 module/repo/test/model/saverecord.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/repo/model.php b/module/repo/model.php
index d3e8f24533..b7d7484380 100644
--- a/module/repo/model.php
+++ b/module/repo/model.php
@@ -1636,6 +1636,7 @@ class repoModel extends model
             ->andWhere('objectID')->eq($action->objectID)
             ->andWhere('extra')->eq($action->extra)
             ->andWhere('action')->eq($action->action)
+            ->andWhere('comment')->eq($action->comment)
             ->fetch();
         if($record)
         {
diff --git a/module/repo/test/model/saverecord.php b/module/repo/test/model/saverecord.php
index 2e785ac6ef..734226e7b9 100755
--- a/module/repo/test/model/saverecord.php
+++ b/module/repo/test/model/saverecord.php
@@ -13,7 +13,7 @@ cid=1
 - 保存一条记录
  - 属性action @gitcommited
  - 属性extra @61e51cadb1
-- 更新已有记录属性actor @admin
+- 更新已有记录属性actor @user4
 - 查看历史记录属性field @git
 
 */
@@ -49,6 +49,6 @@ $repo = new repoTest();
 r($repo->saveRecordTest($action, $log, $repoRoot, $scm)) && p('action,extra') && e('gitcommited,61e51cadb1'); //保存一条记录
 
 $action->actor = 'admin';
-r($repo->saveRecordTest($action, $log, $repoRoot, $scm)) && p('actor') && e('admin'); //更新已有记录
+r($repo->saveRecordTest($action, $log, $repoRoot, $scm)) && p('actor') && e('user4'); //更新已有记录
 
-r($repo->saveRecordTest($action, $log, $repoRoot, $scm, true)) && p('field') && e('git'); //查看历史记录
\ No newline at end of file
+r($repo->saveRecordTest($action, $log, $repoRoot, $scm, true)) && p('field') && e('git'); //查看历史记录