luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'oa' into dev

Browse Source
This commit is contained in:
jhc 2023-05-16 13:30:42 +08:00
commit 2ce5ae8dd6
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/model/approval_oa.go
View File

@ -392,13 +392,23 @@ 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
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
}
func (oa *ApprovalOA) BuildResContent(a *Approval, request *approval.CreateRequest) {