Merge branch 'oa' into dev

2023-05-12 17:29:23 +08:00 · 2023-05-12 17:29:23 +08:00 · 9f9ff4e3de
commit 9f9ff4e3de
parent f94041918f 73075d6be9
1 changed files with 2 additions and 2 deletions
--- a/pkg/model/approval_oa.go
+++ b/pkg/model/approval_oa.go
@ -250,9 +250,9 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
 	fmt.Printf("a info is : %+v\n", a)
 	fmt.Println("============== 打印 审批内容 ========== 结束 =========")

-	fmt.Println(sonMap[a.ApprovalType.KeyWord])
+	fmt.Println(sonMap[a.Type])

-	v := GetSonMapValue(a.ApprovalType.KeyWord)
+	v := GetSonMapValue(a.Type)
 	switch v {
 	case "leave":
 		copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})