This commit is contained in:
Narul Hidayah
2026-01-02 23:24:58 +07:00
parent 293df9046a
commit a578dc5c66
3 changed files with 15 additions and 12 deletions

View File

@ -1,6 +1,6 @@
import axios from "axios"
import config from "config"
import { Paging, User, UserRefreshToken, UserRole } from "entity"
import { Paging, User, UserRefreshToken, UserRole, HrmsEmployee } from "entity"
import exceljs from "exceljs"
import { NextFunction, Response } from "express"
import { Request } from "express-jwt"
@ -251,7 +251,7 @@ export class UserController {
status: Joi.string().required().label("Status"),
})
const param: User = await schema.validateAsync(req.body)
const param: any = await schema.validateAsync(req.body)
const data = new User()
data.name = param.name
@ -260,8 +260,9 @@ export class UserController {
data.email = param.email
data.status = param.status
if (param.employee_id && param.employee_id! + "") {
data.employee_id = param.employee_id
if (param.employee_id && param.employee_id != "") {
const employee = await OrmHelper.DB.manager.getRepository(HrmsEmployee).findOneByOrFail({ id: param.employee_id })
data.employee = employee
}
data.hashPassword()
@ -577,7 +578,7 @@ export class UserController {
req.body.id = req.params["id"]
const param: User = await schema.validateAsync(req.body)
const param: any = await schema.validateAsync(req.body)
const userRepository = OrmHelper.DB.getRepository(User)
@ -585,13 +586,15 @@ export class UserController {
if (data != null) {
data.name = param.name
data.employee_id = param.employee_id
data.username = param.username
data.email = param.email
data.status = param.status
if (param.employee_id && param.employee_id != "") {
data.employee_id = param.employee_id
const employee = await OrmHelper.DB.manager.getRepository(HrmsEmployee).findOneByOrFail({ id: param.employee_id })
data.employee = employee
} else {
data.employee = null
}
if (param.password) {