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-18 18:32:30 +08:00
commit 7d61d8b0c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/model/approval.go
View File

@ -195,7 +195,7 @@ func ExistLeaveApplyApproval(in *approval.CreateRequest) bool {
Where("status in (?)", []uint64{StatusDoing, StatusOk}) Where("status in (?)", []uint64{StatusDoing, StatusOk})
if LeaveBalanceUsefulTime[in.Type] == OnceAYear { if LeaveBalanceUsefulTime[in.Type] == OnceAYear {
subQuery1.Where(" STR_TO_DATE(created_at,'%Y') = ?", time.Now().Format("2006")) subQuery1.Where(" date_format(created_at,'%Y') = ?", time.Now().Format("2006"))
} }
subQuery1.Select("id") subQuery1.Select("id")