From d712508adea127cdeaeba1a9f5460d41649ffcfe Mon Sep 17 00:00:00 2001 From: wahyuun Date: Fri, 22 Mar 2024 10:00:15 +0700 Subject: [PATCH] update all_project condition --- src/views/SimproV2/CreatedProyek/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js index d9c86b4..68ffdb5 100644 --- a/src/views/SimproV2/CreatedProyek/index.js +++ b/src/views/SimproV2/CreatedProyek/index.js @@ -418,12 +418,12 @@ const CreatedProyek = ({ params, ...props }) => { paging: { start: start, length: rowsPerPage }, }; - if (all_project !== null && all_project === true) { + if (role_name !== 'Super Admin' && all_project === 'true') { payload.columns.push( - { name: "company_id", logic_operator: "like", value: company_id, operator: "AND" } + { name: "company_id", logic_operator: "like", value: parseInt(company_id), operator: "AND" } ); } - if (role_name !== 'Super Admin') { + if (role_name !== 'Super Admin' && all_project === 'null') { payload.columns.push( { name: "created_by_id", logic_operator: "IN", value: [JSON.parse(hierarchy)], operator: "AND" } );