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

Merge branch 'develop' into adiDev

Browse source 
# Conflicts:
#	src/controllers/ProfileEmployeeController.ts
This commit is contained in:
AdisakKanthawilang 2024-06-17 14:35:49 +07:00
commit 7351c9b510
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/AuthRoleController.ts
View file

@ -79,11 +79,11 @@ export class AuthRoleController extends Controller {
@Post("govoment")
public async AddAuthRoleGovoment(@Request() req: RequestWithUser, @Body() body: CreateAddAuthRole) {
let _NULL_ : any = null;
let NULL_ : any = null;
let getDetail
if(body.authRoleId == "") {
body.authRoleId = _NULL_
body.authRoleId = NULL_
}
else {
getDetail = await this.authRoleRepo.findOneBy({ id: body.authRoleId });
@ -103,11 +103,11 @@ export class AuthRoleController extends Controller {
@Post("employee")
public async AddAuthRoleEmployee(@Request() req: RequestWithUser, @Body() body: CreateAddAuthRole) {
let _NULL_ : any = null;
let NULL_ : any = null;
let getDetail
if(body.authRoleId == "") {
body.authRoleId = _NULL_
body.authRoleId = NULL_
}
else {
getDetail = await this.authRoleRepo.findOneBy({ id: body.authRoleId });

1
src/controllers/ProfileController.ts
View file

@ -1631,6 +1631,7 @@ export class ProfileController extends Controller {
profileId: profile.id,
prefix: profile.prefix,
rank: profile.rank,
isProbation: profile.isProbation,
firstName: profile.firstName,
lastName: profile.lastName,
citizenId: profile.citizenId,