Merge branch 'oa' into dev

This commit is contained in:
jhc 2023-05-18 18:21:37 +08:00
commit b9b389e25c

View File

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