luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'oa' into dev

Browse Source
This commit is contained in:
jhc 2023-05-12 15:24:45 +08:00
commit de2ec5267c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/model/approval_oa.go
View File

@ -208,7 +208,9 @@ func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approva
return err
}
return DB.Create(&approvalOA).Error
fmt.Println("存入 数据库 approval_oa 信息 ")
return DB.Create(approvalOA).Error
}
func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *ApprovalOA, err error) {
@ -233,7 +235,7 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
case "leave":
approvalOA.Leave.ApprovalUsers = a.ApprovalUsers
approvalOA.Leave.CopyUsers = a.CopyUsers
if approvalOA.Leave.ApplyType != "" {
if approvalOA.Leave.ApplyType == "" {
approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
}
approvalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10)
@ -318,6 +320,9 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
approvalOA.LeaveApply.ApplyType = a.ApprovalType.KeyWord
approvalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10)
approvalOA.LeaveApply.Status = int32(a.Status)
if approvalOA.Leave.ApplyType == "" {
approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
}
default:
return errors.New("未找到相关审批类型")
}