修改导入包名

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

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{})