diff --git a/api/app/lib/utils/member.js b/api/app/lib/utils/member.js index 26118d1..4442dbb 100644 --- a/api/app/lib/utils/member.js +++ b/api/app/lib/utils/member.js @@ -155,7 +155,7 @@ module.exports = function (app, opts) { ) AS overtimeDayStatistic ON overtimeDayStatistic.pepUserId = member.pep_user_id`: ''} - ${overtimeCountStatistic ? ` + ${overtimeCountStatistic? ` LEFT JOIN ( SELECT overtime.pep_user_id AS pepUserId, @@ -253,7 +253,7 @@ module.exports = function (app, opts) { ${orderBy == 'overtimeTakeRestSum' || orderBy == 'overtimePaySum' || orderBy == 'overtimeSum' ? ` - overtimeDayStatistic.duration AS overtimeDayStatisticDuration + overtimeDayStatistic.duration AS overtimeDayStatisticDuration, `: ''} ${overtimeCountStatistic ? ` @@ -301,7 +301,7 @@ module.exports = function (app, opts) { : orderBy == 'overtimeTakeRestSum' || orderBy == 'overtimePaySum' || orderBy == 'overtimeSum' ? - 'hrMember."member.overtimeDayStatisticDuration"' + 'hrMember.overtimeDayStatisticDuration' : orderBy == 'overtimeCount' ? 'hrMember.overtimeCount' : orderBy == 'vacateSum' ?