From 753f55c21634326eaa24b5f9b1ab065096b667d7 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Mon, 17 Oct 2022 16:56:42 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=9C=A8=E8=81=8C=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/schedule/attendance.js | 2 +- api/app/lib/utils/member.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/app/lib/schedule/attendance.js b/api/app/lib/schedule/attendance.js index 8a1c20d..3f703e0 100644 --- a/api/app/lib/schedule/attendance.js +++ b/api/app/lib/schedule/attendance.js @@ -6,7 +6,7 @@ module.exports = function (app, opts) { // 妥妥流水账 (*^▽^*) { // interval: '34 21 4 * * *', - interval: '34 21 */1 * * *', + interval: '34 */15 * * * *', // immediate: true, // proRun: true, }, diff --git a/api/app/lib/utils/member.js b/api/app/lib/utils/member.js index 1ab6503..a1d61b4 100644 --- a/api/app/lib/utils/member.js +++ b/api/app/lib/utils/member.js @@ -111,8 +111,8 @@ module.exports = function (app, opts) { AND department.name LIKE '%${keyword}%' ) ` : ''} - ${state == 'dimission' ? `AND member.dimission_date != '1970-01-01 00:00:00.000000'` : ''} - ${state == 'onJob' ? `AND member.dimission_date = '1970-01-01 00:00:00.000000'` : ''} + ${state == 'dimission' ? `AND member.dimission_date IS NOT null` : ''} + ${state == 'onJob' ? `AND member.dimission_date IS null` : ''} ${whereFromSelectOption.length ? `AND ${whereFromSelectOption.join('AND')}` : ''} ` @@ -121,6 +121,7 @@ module.exports = function (app, opts) { hrMember."member.pep_user_id" AS pepUserId, hrMember.*, user.name AS userName, + user.people_code AS userCode, role.name AS roleName, role.id AS roleId, department.name AS depName,