|
|
|
@ -218,14 +218,24 @@ func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (ap
|
|
|
|
|
copier.CopyWithOption(&approvalOA, in.ApprovalOA, copier.Option{DeepCopy: true})
|
|
|
|
|
approvalOA.ApprovalID = a.ID
|
|
|
|
|
|
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 开始 =========")
|
|
|
|
|
fmt.Println("============== 打印 审批内容 1.0 ========== 开始 =========")
|
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA)
|
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA.Leave)
|
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
|
|
|
|
|
|
if err := oa.addOtherInfoToModel(in, a, approvalOA); err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fmt.Println("============== 打印 审批内容 2.0 ========== 开始 =========")
|
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA)
|
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA.Leave)
|
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
|
|
|
|
|
|
return approvalOA, nil
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|