Merge branch 'oa' into dev

pkg/model/approval_oa.go

@@ -392,13 +392,23 @@ func (oa *ApprovalOA) UpdateApprovalContent(in *approval.CreateRequest, a *Appro
 	}
 
 	oa.ID = entity.ID
+	copier.CopyWithOption(&oa, in.ApprovalOA, copier.Option{DeepCopy: true})
+
+	err := addOtherInfoToModel(a, oa)
 
-	approvalOA, err := copyOAToModel(in, a)
 	if err != nil {
 		return err
 	}
 
-	return DB.Model(&oa).Updates(approvalOA).Error
+	fmt.Println("============== 更新 审批内容  1.0 ========== 开始 =========")
+	fmt.Printf("in.approvalOA info is : %+v\n", in.ApprovalOA)
+	fmt.Printf("a info is : %+v\n", a)
+	fmt.Printf("oa info is : %+v\n", oa)
+	fmt.Println("oa CopyUsers info is : ", a.CopyUsers)
+	fmt.Println("oa ApprovalUsers info is : ", a.ApprovalUsers)
+	fmt.Println("============== 更新 审批内容 ========== 结束 =========")
+
+	return DB.Model(&oa).Updates(oa).Error
 }
 
 func (oa *ApprovalOA) BuildResContent(a *Approval, request *approval.CreateRequest) {