|
|
@ -82,12 +82,6 @@ const ProjectType = ({ params }) => { |
|
|
|
"logic_operator": "like", |
|
|
|
"logic_operator": "like", |
|
|
|
"value": search, |
|
|
|
"value": search, |
|
|
|
"operator": "AND" |
|
|
|
"operator": "AND" |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
"name": "company_id", |
|
|
|
|
|
|
|
"logic_operator": "like", |
|
|
|
|
|
|
|
"value": company_id, |
|
|
|
|
|
|
|
"operator": "AND" |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
], |
|
|
|
], |
|
|
|
"orders": { |
|
|
|
"orders": { |
|
|
@ -101,7 +95,15 @@ const ProjectType = ({ params }) => { |
|
|
|
"start": start |
|
|
|
"start": start |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (role_name !== "Super Admin") { |
|
|
|
|
|
|
|
payload.columns.push( |
|
|
|
|
|
|
|
{ "name": "company_id", "logic_operator": "=", "value": company_id, "operator": "AND" }, |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
payload.columns.push( |
|
|
|
|
|
|
|
{ "name": "company_id", "logic_operator": "is null", "value": "", "operator": "AND" }, |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
const result = await axios |
|
|
|
const result = await axios |
|
|
|
.post(PROJECT_TYPE_SEARCH, payload, config, HEADER) |
|
|
|
.post(PROJECT_TYPE_SEARCH, payload, config, HEADER) |
|
|
|
.then(res => res) |
|
|
|
.then(res => res) |
|
|
|