|
@ -108,7 +108,6 @@ async function searchPepMember (ctx) { |
|
|
user.name AS userName, |
|
|
user.name AS userName, |
|
|
role.name AS roleName, |
|
|
role.name AS roleName, |
|
|
role.id AS roleId, |
|
|
role.id AS roleId, |
|
|
basicdata_post.name AS userPost, |
|
|
|
|
|
department.name AS depName, |
|
|
department.name AS depName, |
|
|
department.id AS depId |
|
|
department.id AS depId |
|
|
FROM |
|
|
FROM |
|
@ -123,8 +122,6 @@ async function searchPepMember (ctx) { |
|
|
ON department_user.user = user.id |
|
|
ON department_user.user = user.id |
|
|
LEFT JOIN department |
|
|
LEFT JOIN department |
|
|
ON department.id = department_user.department |
|
|
ON department.id = department_user.department |
|
|
LEFT JOIN basicdata_post |
|
|
|
|
|
ON basicdata_post.id = user.post |
|
|
|
|
|
WHERE |
|
|
WHERE |
|
|
user.delete = '0' |
|
|
user.delete = '0' |
|
|
${whereOption.length ? `AND ${whereOption.join(' OR ')}` : ''} |
|
|
${whereOption.length ? `AND ${whereOption.join(' OR ')}` : ''} |
|
@ -160,8 +157,7 @@ async function searchPepMember (ctx) { |
|
|
role: u.roleId ? [{ |
|
|
role: u.roleId ? [{ |
|
|
id: u.roleId, |
|
|
id: u.roleId, |
|
|
name: u.roleName |
|
|
name: u.roleName |
|
|
}] : [], |
|
|
}] : [] |
|
|
userPost:u.userPost |
|
|
|
|
|
}) |
|
|
}) |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|