Merge branch 'oa' into dev

main
jhc 1 year ago
commit 7d61d8b0c7

@ -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")

Loading…
Cancel
Save