Merge branch 'oa' into dev

This commit is contained in:
jhc 2023-05-12 17:29:23 +08:00
commit 9f9ff4e3de

View File

@ -250,9 +250,9 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
fmt.Printf("a info is : %+v\n", a) fmt.Printf("a info is : %+v\n", a)
fmt.Println("============== 打印 审批内容 ========== 结束 =========") fmt.Println("============== 打印 审批内容 ========== 结束 =========")
fmt.Println(sonMap[a.ApprovalType.KeyWord]) fmt.Println(sonMap[a.Type])
v := GetSonMapValue(a.ApprovalType.KeyWord) v := GetSonMapValue(a.Type)
switch v { switch v {
case "leave": case "leave":
copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})