Merge branch 'oa' into dev

pkg/model/approval_oa.go

@@ -178,6 +178,10 @@ var sonMap = map[string]string{
 	"nursingLeaveApply":     "leaveApply", // 独生子女护理假申请
 }
 
+func GetSonMapValue(k string) string {
+	return sonMap[k]
+}
+
 // TableName get sql table name.获取数据库表名
 func (oa *ApprovalOA) TableName() string {
 	return "approval_oa"
@@ -246,7 +250,9 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
 	fmt.Printf("a info is : %+v\n", a)
 	fmt.Println("============== 打印 审批内容 ========== 结束 =========")
 
-	if v, ok := sonMap[a.ApprovalType.KeyWord]; ok {
+	fmt.Println(sonMap[a.ApprovalType.KeyWord])
+
+	v := GetSonMapValue(a.ApprovalType.KeyWord)
 	switch v {
 	case "leave":
 		copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
@@ -309,7 +315,7 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
 	default:
 		return errors.New("未找到相关审批类型")
 	}
-	}
+
 	return nil
 }