|
|
|
@ -245,9 +245,22 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
|
|
|
|
|
case "leave":
|
|
|
|
|
approvalOA.Leave.ApprovalUsers = make([]ApprovalUser, 0)
|
|
|
|
|
approvalOA.Leave.ApprovalUsers = a.ApprovalUsers
|
|
|
|
|
fmt.Println("============== 打印 审批内容 3.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("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
|
|
|
|
|
|
approvalOA.Leave.CopyUsers = make([]CopyUser, 0)
|
|
|
|
|
approvalOA.Leave.CopyUsers = a.CopyUsers
|
|
|
|
|
fmt.Println("============== 打印 审批内容 4.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 approvalOA.Leave.ApplyType == "" {
|
|
|
|
|
approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
|
|
|
|
|
}
|
|
|
|
|