Merge branch 'oa' into dev
This commit is contained in:
commit
ec7fe28657
@ -296,7 +296,7 @@ func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approva
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// TODO 序列化 leave_apply 等
|
|
||||||
fmt.Println("存入 数据库 approval_oa 信息 ")
|
fmt.Println("存入 数据库 approval_oa 信息 ")
|
||||||
|
|
||||||
return DB.Create(&approvalOA).Error
|
return DB.Create(&approvalOA).Error
|
||||||
@ -310,6 +310,7 @@ func copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *Approva
|
|||||||
fmt.Println("============== 打印 审批内容 1.0 ========== 开始 =========")
|
fmt.Println("============== 打印 审批内容 1.0 ========== 开始 =========")
|
||||||
fmt.Printf("approval_oa info is : %+v\n", approvalOA)
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA)
|
||||||
fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave)
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave)
|
||||||
|
fmt.Printf("a info is : %+v\n", a)
|
||||||
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
||||||
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
||||||
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
||||||
|
Loading…
Reference in New Issue
Block a user