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-29 13:35:27 +08:00
commit 91e973f204
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/model/approval.go
View File

@ -8,7 +8,6 @@ import (
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval/api/approval"
"github.com/fonchain_enterprise/fonchain-approval/pkg/common/page" "github.com/fonchain_enterprise/fonchain-approval/pkg/common/page"
msg "github.com/fonchain_enterprise/fonchain-approval/pkg/m" msg "github.com/fonchain_enterprise/fonchain-approval/pkg/m"
"github.com/jinzhu/copier"
"gorm.io/gorm" "gorm.io/gorm"
"gorm.io/gorm/clause" "gorm.io/gorm/clause"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
@ -857,7 +856,12 @@ func UpdateLeaveBalance(p *Approval, leaveBalance string) error {
approvalOA := new(ApprovalOA) approvalOA := new(ApprovalOA)
copier.CopyWithOption(&approvalOA, p.ApprovalOA, copier.Option{DeepCopy: true}) err := DB.Model(&ApprovalOA{}).Where("approval_id = ?", p.ID).Find(&approvalOA).Error
if err != nil {
return err
}
//copier.CopyWithOption(&approvalOA, p.ApprovalOA, copier.Option{DeepCopy: true})
balance, _ := strconv.ParseFloat(leaveBalance, 10) balance, _ := strconv.ParseFloat(leaveBalance, 10)