From fbdd1f80157660f0285988951e48511caeb23b20 Mon Sep 17 00:00:00 2001
From: luyanming <1490927649@qq.com>
Date: Wed, 21 Jun 2023 15:04:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E5=8C=85?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/model/approval_oa.go      | 41 ++++++++++++++++++-----------------
 pkg/model/approval_setting.go |  4 ++--
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go
index 1676c4d..7c9475a 100644
--- a/pkg/model/approval_oa.go
+++ b/pkg/model/approval_oa.go
@@ -5,8 +5,8 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/fonchain_enterprise/fonchain-approval/api/approval"
-	m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m"
+	"github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
+	m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
 	"github.com/jinzhu/copier"
 	"gorm.io/plugin/soft_delete"
 	"strconv"
@@ -464,29 +464,30 @@ func (oa *ApprovalOA) copyOAToRpc(a *Approval, request *approval.CreateRequest)
 	return nil
 }
 
-/*func (oa *ApprovalOA) addOtherInfoToRpc(a *Approval, in *approval.CreateRequest) error {
-	if oa.Leave != nil {
-		copier.CopyWithOption(&a.ApprovalOA.Leave.ApplyTimes, in.ApprovalOA.Leave.ApplyTimes, copier.Option{DeepCopy: true})
-	}
+/*
+	func (oa *ApprovalOA) addOtherInfoToRpc(a *Approval, in *approval.CreateRequest) error {
+		if oa.Leave != nil {
+			copier.CopyWithOption(&a.ApprovalOA.Leave.ApplyTimes, in.ApprovalOA.Leave.ApplyTimes, copier.Option{DeepCopy: true})
+		}
 
-	if oa.MakeUp != nil {
-		copier.CopyWithOption(&a.ApprovalOA.MakeUp.ApplyTimes, in.ApprovalOA.MakeUp.ApplyTimes, copier.Option{DeepCopy: true})
-	}
+		if oa.MakeUp != nil {
+			copier.CopyWithOption(&a.ApprovalOA.MakeUp.ApplyTimes, in.ApprovalOA.MakeUp.ApplyTimes, copier.Option{DeepCopy: true})
+		}
 
-	if oa.Turnover != nil {
-		copier.CopyWithOption(&a.ApprovalOA.Turnover.ApplyTimes, in.ApprovalOA.Turnover.ApplyTimes, copier.Option{DeepCopy: true})
-	}
+		if oa.Turnover != nil {
+			copier.CopyWithOption(&a.ApprovalOA.Turnover.ApplyTimes, in.ApprovalOA.Turnover.ApplyTimes, copier.Option{DeepCopy: true})
+		}
 
-	if oa.OverTime != nil {
-		copier.CopyWithOption(&a.ApprovalOA.OverTime.ApplyTimes, in.ApprovalOA.OverTime.ApplyTimes, copier.Option{DeepCopy: true})
-	}
+		if oa.OverTime != nil {
+			copier.CopyWithOption(&a.ApprovalOA.OverTime.ApplyTimes, in.ApprovalOA.OverTime.ApplyTimes, copier.Option{DeepCopy: true})
+		}
 
-	if oa.OutWork != nil {
-		copier.CopyWithOption(&a.ApprovalOA.OutWork.ApplyTimes, in.ApprovalOA.OutWork.ApplyTimes, copier.Option{DeepCopy: true})
-	}
+		if oa.OutWork != nil {
+			copier.CopyWithOption(&a.ApprovalOA.OutWork.ApplyTimes, in.ApprovalOA.OutWork.ApplyTimes, copier.Option{DeepCopy: true})
+		}
 
-	return nil
-}
+		return nil
+	}
 */
 func (oa *ApprovalOA) DeleteApproval(p *Approval) error {
 	return DB.Where(&ApprovalOA{ApprovalID: p.ID}).Delete(&ApprovalOA{}).Error
diff --git a/pkg/model/approval_setting.go b/pkg/model/approval_setting.go
index c14de2b..2056189 100644
--- a/pkg/model/approval_setting.go
+++ b/pkg/model/approval_setting.go
@@ -3,7 +3,7 @@ package model
 import (
 	"database/sql/driver"
 	"encoding/json"
-	"github.com/fonchain_enterprise/fonchain-approval/api/approval"
+	"github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
 	"gorm.io/plugin/soft_delete"
 	"time"
 )
@@ -108,7 +108,7 @@ func FormatApproveUsers(copyUsers []*approval.ApprovalUser) ApprovalUsers {
 	return res
 }
 
-//GetCombineApproveUsers 混合获取
+// GetCombineApproveUsers 混合获取
 func (m *ApprovalSetting) GetCombineApproveUsers(approvalUser []ApprovalUser) []ApprovalUser {
 	approvalUserMap := make(map[uint64]struct{})