Commit 1a4f0695 authored by ml's avatar ml

修改

parent 1e2908b8
...@@ -242,7 +242,7 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag ...@@ -242,7 +242,7 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
uids.push(item.user_id); uids.push(item.user_id);
} }
//有则分页查询部门用户 //有则分页查询部门用户
pageData = await getDpUserPageData(dIds, page, size, []); pageData = await getDpUserPageData(dIds, page, size, uids);
for (let oneItem of pageData.rows) { for (let oneItem of pageData.rows) {
oneItem.account = userMap[oneItem.user_id] ? userMap[oneItem.user_id].account : ""; oneItem.account = userMap[oneItem.user_id] ? userMap[oneItem.user_id].account : "";
oneItem.phone = userMap[oneItem.user_id] ? userMap[oneItem.user_id].phone : ""; oneItem.phone = userMap[oneItem.user_id] ? userMap[oneItem.user_id].phone : "";
...@@ -302,7 +302,7 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag ...@@ -302,7 +302,7 @@ export const getUserList = async function (aclDepartmentPageVO: AclDepartmentPag
async function getDpUserPageData(dIds: string, page: number, size: number, uids: number[]) { async function getDpUserPageData(dIds: string, page: number, size: number, uids: number[]) {
let where = {}; let where = {};
if (dIds) { if (dIds) {
where['department_id'] = dIds; where['department_id'] = {[madAdminOrmDB.Op.like]:`${dIds}%`};
} }
if (uids.length) { if (uids.length) {
where['user_id'] = { [madAdminOrmDB.Op.in]: uids } where['user_id'] = { [madAdminOrmDB.Op.in]: uids }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment