hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branches 'develop' and 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source 
# Conflicts:
#	src/controllers/PermissionController.ts
This commit is contained in:
Warunee Tamkoo 2024-07-31 09:52:31 +07:00
commit a6765de84e
2 changed files with 696 additions and 690 deletions
Download patch file Download diff file Expand all files Collapse all files

1378
src/controllers/ImportDataController.ts
View file

File diff suppressed because it is too large Load diff

8
src/controllers/PermissionController.ts
View file

@ -81,7 +81,7 @@ export class PermissionController extends Controller {
...getDetail, ...getDetail,
roles: roleAttrData, roles: roleAttrData,
}; };
// redisClient.set("role_" + request.user.sub, JSON.stringify(reply)); // redisClient.setex("role_" + request.user.sub, 86400, JSON.stringify(reply));
// } // }
return new HttpSuccess(reply); return new HttpSuccess(reply);
} }
@ -129,7 +129,7 @@ export class PermissionController extends Controller {
} }
const roleAttrData = await this.authRoleAttrRepo.find({ const roleAttrData = await this.authRoleAttrRepo.find({
select: ["authSysId"], select: ["authSysId"],
where: { authRoleId: authRole.id }, where: { authRoleId: authRole.id, attrIsList: true },
}); });
const getList = await this.authSysRepo.find({ const getList = await this.authSysRepo.find({
@ -150,8 +150,8 @@ export class PermissionController extends Controller {
}; };
}) })
.sort((a, b) => a.order - b.order); .sort((a, b) => a.order - b.order);
console.log(JSON.stringify(reply)); // console.log(JSON.stringify(reply));
redisClient.set("menu_" + request.user.sub, 30, JSON.stringify(reply)); redisClient.setex("menu_" + request.user.sub, 86400, JSON.stringify(reply));
} }
return new HttpSuccess(reply); return new HttpSuccess(reply);