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

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

Browse source
This commit is contained in:
kittapath 2024-09-02 15:35:26 +07:00
commit 970ae04afd
6 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/controllers/ProfileAbilityController.ts
View file

@ -66,12 +66,12 @@ export class ProfileAbilityController extends Controller {
@Path() abilityId: string, @Path() abilityId: string,
@Request() req: RequestWithUser, @Request() req: RequestWithUser,
) { ) {
const _record = await this.profileAbilityRepo.findOne({ // const _record = await this.profileAbilityRepo.findOne({
where: { id: abilityId }, // where: { id: abilityId },
}); // });
if (_record) { // if (_record) {
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId); // await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
} // }
const record = await this.profileAbilityHistoryRepo.find({ const record = await this.profileAbilityHistoryRepo.find({
where: { profileAbilityId: abilityId }, where: { profileAbilityId: abilityId },
order: { createdAt: "DESC" }, order: { createdAt: "DESC" },

13
src/controllers/ProfileAssessmentsController.ts
View file

@ -70,11 +70,6 @@ export class ProfileAssessmentsController extends Controller {
@Path() assessmentId: string, @Path() assessmentId: string,
@Request() req: RequestWithUser, @Request() req: RequestWithUser,
) { ) {
const _record = await this.profileAssessmentsRepository.findOneBy({
id: assessmentId,
});
if (_record)
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
const record = await this.profileAssessmentsHistoryRepository.find({ const record = await this.profileAssessmentsHistoryRepository.find({
where: { where: {
profileAssessmentId: assessmentId, profileAssessmentId: assessmentId,
@ -85,6 +80,14 @@ export class ProfileAssessmentsController extends Controller {
if (!record) { if (!record) {
throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล"); throw new HttpError(HttpStatus.NOT_FOUND, "ไม่พบข้อมูล");
} }
// const _record = await this.profileAssessmentsRepository.findOne({
// where: {
// id: assessmentId,
// },
// });
// if (_record) {
// await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
// }
return new HttpSuccess(record); return new HttpSuccess(record);
} }

8
src/controllers/ProfileCertificateController.ts
View file

@ -57,10 +57,10 @@ export class ProfileCertificateController extends Controller {
@Get("history/{certificateId}") @Get("history/{certificateId}")
public async certificateHistory(@Path() certificateId: string, @Request() req: RequestWithUser) { public async certificateHistory(@Path() certificateId: string, @Request() req: RequestWithUser) {
const _record = await this.certificateRepo.findOneBy({ id: certificateId }); // const _record = await this.certificateRepo.findOneBy({ id: certificateId });
if (_record) { // if (_record) {
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId); // await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
} // }
const record = await this.certificateHistoryRepo.find({ const record = await this.certificateHistoryRepo.find({
where: { where: {
profileCertificateId: certificateId, profileCertificateId: certificateId,

8
src/controllers/ProfileEducationsController.ts
View file

@ -68,10 +68,10 @@ export class ProfileEducationsController extends Controller {
@Path() educationId: string, @Path() educationId: string,
@Request() req: RequestWithUser, @Request() req: RequestWithUser,
) { ) {
const _record = await this.profileEducationRepo.findOneBy({ id: educationId }); // const _record = await this.profileEducationRepo.findOneBy({ id: educationId });
if (_record) { // if (_record) {
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId); // await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
} // }
const record = await this.profileEducationHistoryRepo.find({ const record = await this.profileEducationHistoryRepo.find({
where: { where: {
profileEducationId: educationId, profileEducationId: educationId,

8
src/controllers/ProfileOtherController.ts
View file

@ -54,10 +54,10 @@ export class ProfileOtherController extends Controller {
@Get("history/{otherId}") @Get("history/{otherId}")
public async otherHistory(@Path() otherId: string, @Request() req: RequestWithUser) { public async otherHistory(@Path() otherId: string, @Request() req: RequestWithUser) {
const _record = await this.otherRepository.findOneBy({ id: otherId }); // const _record = await this.otherRepository.findOneBy({ id: otherId });
if (_record) { // if (_record) {
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId); // await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
} // }
const record = await this.otherHistoryRepository.find({ const record = await this.otherHistoryRepository.find({
where: { profileOtherId: otherId }, where: { profileOtherId: otherId },
order: { createdAt: "DESC" }, order: { createdAt: "DESC" },

8
src/controllers/ProfileSalaryController.ts
View file

@ -65,10 +65,10 @@ export class ProfileSalaryController extends Controller {
@Get("history/{salaryId}") @Get("history/{salaryId}")
public async salaryHistory(@Path() salaryId: string, @Request() req: RequestWithUser) { public async salaryHistory(@Path() salaryId: string, @Request() req: RequestWithUser) {
const _record = await this.salaryRepo.findOneBy({ id: salaryId }); // const _record = await this.salaryRepo.findOneBy({ id: salaryId });
if (_record) { // if (_record) {
await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId); // await new permission().PermissionOrgUserGet(req, "SYS_REGISTRY_OFFICER", _record.profileId);
} // }
const record = await this.salaryHistoryRepo.find({ const record = await this.salaryHistoryRepo.find({
where: { where: {
profileSalaryId: salaryId, profileSalaryId: salaryId,