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-12 16:08:56 +08:00
commit 5740aea1a3
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/model/approval_oa.go
View File

@ -245,9 +245,22 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
case "leave": case "leave":
approvalOA.Leave.ApprovalUsers = make([]ApprovalUser, 0) approvalOA.Leave.ApprovalUsers = make([]ApprovalUser, 0)
approvalOA.Leave.ApprovalUsers = a.ApprovalUsers 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 = make([]CopyUser, 0)
approvalOA.Leave.CopyUsers = a.CopyUsers 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 == "" { if approvalOA.Leave.ApplyType == "" {
approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
} }