diff --git a/src/controllers/user.ts b/src/controllers/user.ts index 01466a1..bb5a734 100644 --- a/src/controllers/user.ts +++ b/src/controllers/user.ts @@ -495,12 +495,6 @@ export class UserController { const param: any = await schema.validateAsync(req.body); - const data = new User(); - data.name = param.name; - data.username = param.username; - data.password = param.password; - data.email = param.email; - data.status = param.status; const username = await OrmHelper.DB.getRepository(User).findOne({ where: { @@ -526,6 +520,8 @@ export class UserController { throw { message: "Username already exists" }; } + const data = new User(); + if (param.employee_id && param.employee_id != "") { const employee = await OrmHelper.DB.manager.getRepository(HrmsEmployee).findOneByOrFail({ id: param.employee_id }); data.employee = employee; @@ -533,6 +529,12 @@ export class UserController { data.employee = null; } + data.name = param.name; + data.username = param.username; + data.password = param.password; + data.email = param.email; + data.status = param.status; + data.hashPassword(); data.created_by = req.auth?.data.name; data.created_at = new Date();