|
@@ -60,16 +60,7 @@ router.post("/create-company", async (req, res, next) => {
|
|
(${companyId}, ${name}, ${userId}, ${timezone})`,
|
|
(${companyId}, ${name}, ${userId}, ${timezone})`,
|
|
);
|
|
);
|
|
|
|
|
|
- // add user to company
|
|
|
|
- await db.query(
|
|
|
|
- sql.unsafe`
|
|
|
|
- insert into companies_management.company_users
|
|
|
|
- (company_id, user_id)
|
|
|
|
- values
|
|
|
|
- (${companyId}, ${userId})`,
|
|
|
|
- );
|
|
|
|
-
|
|
|
|
- // permissions
|
|
|
|
|
|
+ // добавляем юзера в компанию
|
|
const MANAGER_ROLE_ID = config.COMPANY_DEFAULT_ROLE_MANAGER_ID;
|
|
const MANAGER_ROLE_ID = config.COMPANY_DEFAULT_ROLE_MANAGER_ID;
|
|
if (!MANAGER_ROLE_ID) {
|
|
if (!MANAGER_ROLE_ID) {
|
|
throw Error("COMPANY_DEFAULT_ROLE_MANAGER_ID is not defined");
|
|
throw Error("COMPANY_DEFAULT_ROLE_MANAGER_ID is not defined");
|
|
@@ -113,10 +104,10 @@ router.post("/get-user-companies", async (req, res, next) => {
|
|
c.timezone
|
|
c.timezone
|
|
from
|
|
from
|
|
companies_management.companies c
|
|
companies_management.companies c
|
|
- join companies_management.company_users cu on
|
|
|
|
- c.company_id = cu.company_id
|
|
|
|
|
|
+ join permissions_management.cached_user_permissions cup on
|
|
|
|
+ c.company_id = cup.entity_id
|
|
where
|
|
where
|
|
- cu.user_id = ${userId}
|
|
|
|
|
|
+ cup.user_id = ${userId}
|
|
`,
|
|
`,
|
|
);
|
|
);
|
|
|
|
|