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

修改

Browse Source
This commit is contained in:
jhc 2023-05-12 15:16:36 +08:00
parent 25a7a42329
commit a24a215b35
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 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) { 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": case "leave":
approvalOA.Leave.ApprovalUsers = a.ApprovalUsers approvalOA.Leave.ApprovalUsers = a.ApprovalUsers
approvalOA.Leave.CopyUsers = a.CopyUsers approvalOA.Leave.CopyUsers = a.CopyUsers
if approvalOA.Leave.ApplyType != "" { if approvalOA.Leave.ApplyType == "" {
approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
} }
approvalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10) 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.ApplyType = a.ApprovalType.KeyWord
approvalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10)
approvalOA.LeaveApply.Status = int32(a.Status) approvalOA.LeaveApply.Status = int32(a.Status)
if approvalOA.Leave.ApplyType == "" {
approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
}
default: default:
return errors.New("未找到相关审批类型") return errors.New("未找到相关审批类型")
} }