diff --git a/api/app/lib/controllers/member/index.js b/api/app/lib/controllers/member/index.js index 5598c61..37d5b84 100644 --- a/api/app/lib/controllers/member/index.js +++ b/api/app/lib/controllers/member/index.js @@ -120,7 +120,7 @@ async function searchPepMember (ctx) { LEFT JOIN department ON department.id = department_user.department WHERE - user.delete = false + user.delete = '0' ${whereOption.length ? `AND ${whereOption.join(' OR ')}` : ''} `).toPromise() diff --git a/api/app/lib/utils/member.js b/api/app/lib/utils/member.js index 936f790..479d521 100644 --- a/api/app/lib/utils/member.js +++ b/api/app/lib/utils/member.js @@ -199,7 +199,7 @@ module.exports = function (app, opts) { ON vacateCountStatistic.pepUserId = member.pep_user_id `: ''} WHERE - member.del = false + member.del = '0' ${keywordTarget == 'role' && keyword ? ` AND user.id IN ( SELECT user_role.user