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/hrms-api-org into develop

Browse source
This commit is contained in:
mamoss 2025-03-28 12:26:20 +07:00
commit d281e37b2c
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/OrganizationController.ts
View file

@ -7576,7 +7576,7 @@ export class OrganizationController extends Controller {
order: { orgRootName: "ASC" }, order: { orgRootName: "ASC" },
select: ["orgRootName"], select: ["orgRootName"],
}); });
const root = [root1, root2]; const root = [...root1, ...root2];
const child1 = await this.child1Repository.find({ const child1 = await this.child1Repository.find({
where: { where: {

12
src/controllers/OrganizationDotnetController.ts
View file

@ -536,17 +536,17 @@ export class OrganizationDotnetController extends Controller {
registrationProvinceId: profile.registrationProvinceId, registrationProvinceId: profile.registrationProvinceId,
registrationDistrictId: profile.registrationDistrictId, registrationDistrictId: profile.registrationDistrictId,
registrationSubDistrictId: profile.registrationSubDistrictId, registrationSubDistrictId: profile.registrationSubDistrictId,
registrationProvince: profile.registrationProvince.id, registrationProvince: profile.registrationProvince.name,
registrationDistrict: profile.registrationDistrict.id, registrationDistrict: profile.registrationDistrict.name,
registrationSubDistrict: profile.registrationSubDistrict.id, registrationSubDistrict: profile.registrationSubDistrict.name,
registrationZipCode: profile.registrationZipCode, registrationZipCode: profile.registrationZipCode,
currentAddress: profile.currentAddress, currentAddress: profile.currentAddress,
currentProvinceId: profile.currentProvinceId, currentProvinceId: profile.currentProvinceId,
currentDistrictId: profile.currentDistrictId, currentDistrictId: profile.currentDistrictId,
currentSubDistrictId: profile.currentSubDistrictId, currentSubDistrictId: profile.currentSubDistrictId,
currentProvince: profile.currentProvince.id, currentProvince: profile.currentProvince.name,
currentDistrict: profile.currentDistrict.id, currentDistrict: profile.currentDistrict.name,
currentSubDistrict: profile.currentSubDistrict.id, currentSubDistrict: profile.currentSubDistrict.name,
currentZipCode: profile.currentZipCode, currentZipCode: profile.currentZipCode,
dutyTimeId: profile.dutyTimeId, dutyTimeId: profile.dutyTimeId,
dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate, dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,