From b770c2de2cb4522dbe55966e52c479c62f9cff1f Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Tue, 16 May 2023 13:28:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20update=20oa?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval_oa.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go
index 947106f..3f62fb4 100644
--- a/pkg/model/approval_oa.go
+++ b/pkg/model/approval_oa.go
@@ -392,13 +392,15 @@ func (oa *ApprovalOA) UpdateApprovalContent(in *approval.CreateRequest, a *Appro
 	}
 
 	oa.ID = entity.ID
+	copier.CopyWithOption(&oa, in.ApprovalOA, copier.Option{DeepCopy: true})
+
+	err := addOtherInfoToModel(a, oa)
 
-	approvalOA, err := copyOAToModel(in, a)
 	if err != nil {
 		return err
 	}
 
-	return DB.Model(&oa).Updates(approvalOA).Error
+	return DB.Model(&oa).Updates(oa).Error
 }
 
 func (oa *ApprovalOA) BuildResContent(a *Approval, request *approval.CreateRequest) {

From 2c5f6df7e892d3ff7970067bcce0fd8e837ddcf0 Mon Sep 17 00:00:00 2001
From: jhc <9316338+wangyitao309@user.noreply.gitee.com>
Date: Tue, 16 May 2023 13:30:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval_oa.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go
index 3f62fb4..28faf8e 100644
--- a/pkg/model/approval_oa.go
+++ b/pkg/model/approval_oa.go
@@ -400,6 +400,14 @@ func (oa *ApprovalOA) UpdateApprovalContent(in *approval.CreateRequest, a *Appro
 		return err
 	}
 
+	fmt.Println("============== 更新 审批内容  1.0 ========== 开始 =========")
+	fmt.Printf("in.approvalOA info is : %+v\n", in.ApprovalOA)
+	fmt.Printf("a info is : %+v\n", a)
+	fmt.Printf("oa info is : %+v\n", oa)
+	fmt.Println("oa CopyUsers info is : ", a.CopyUsers)
+	fmt.Println("oa ApprovalUsers info is : ", a.ApprovalUsers)
+	fmt.Println("============== 更新 审批内容 ========== 结束 =========")
+
 	return DB.Model(&oa).Updates(oa).Error
 }