diff --git a/backend/src/controllers/UserController.ts b/backend/src/controllers/UserController.ts index d36b7ff..88d463a 100644 --- a/backend/src/controllers/UserController.ts +++ b/backend/src/controllers/UserController.ts @@ -99,7 +99,7 @@ export const index = async (req: Request, res: Response): Promise => { // }; export const all = async (req: Request, res: Response): Promise => { - const { userId, profile } = req.query as IndexQuery; + let { userId, profile }: any = req.query as IndexQuery; console.log( "userId: ", @@ -110,7 +110,10 @@ export const all = async (req: Request, res: Response): Promise => { getSettingValue("queueTransferByWhatsappScope")?.value ); - if (getSettingValue("queueTransferByWhatsappScope")?.value == "enabled") { + if (getSettingValue("queueTransferByWhatsappScope")?.value == "enabled") { + + if (!userId) return res.json({ users: [], queues: [] }); + const obj = await ListUserByWhatsappQueuesService( userId, '"admin", "user", "supervisor"' @@ -119,7 +122,7 @@ export const all = async (req: Request, res: Response): Promise => { const usersByWhatsqueue = obj.users; const queues = obj.queues; - let userIds = usersByWhatsqueue.map((w: any) => w.userId); + let userIds = usersByWhatsqueue.map((w: any) => w.userId); const users = await ListUser({ userIds diff --git a/backend/src/services/UserServices/ListUserParamiterService.ts b/backend/src/services/UserServices/ListUserParamiterService.ts index ebb610b..2d92498 100644 --- a/backend/src/services/UserServices/ListUserParamiterService.ts +++ b/backend/src/services/UserServices/ListUserParamiterService.ts @@ -2,7 +2,7 @@ import { Op, Sequelize } from "sequelize"; import Queue from "../../models/Queue"; import User from "../../models/User"; import UserQueue from "../../models/UserQueue"; -import { List } from "whatsapp-web.js" +import { List } from "whatsapp-web.js"; interface Request { userId?: string | number; @@ -12,7 +12,13 @@ interface Request { userIds?: string | number; } -const ListUser = async ({ profile, userId, raw, userIds, profiles }: Request): Promise => { +const ListUser = async ({ + profile, + userId, + raw, + userIds, + profiles +}: Request): Promise => { let where_clause = {}; if (userId && profile) { @@ -47,7 +53,7 @@ const ListUser = async ({ profile, userId, raw, userIds, profiles }: Request): P ], order: [["id", "ASC"]], - group: ["User.id"] + group: userIds ? undefined : ["User.id"] }); return users; diff --git a/frontend/src/components/TransferTicketModal/index.js b/frontend/src/components/TransferTicketModal/index.js index a658483..ad79ea4 100644 --- a/frontend/src/components/TransferTicketModal/index.js +++ b/frontend/src/components/TransferTicketModal/index.js @@ -195,6 +195,8 @@ const TransferTicketModal = ({ modalOpen, onClose, ticketid }) => { params: { userId: user.id }, }) + console.log('data.queues: ', data.queues, ' | data.users: ', data.users) + setUsers(data.users) setQueuesByWhats(data.queues) setQueues(data.queues)