Merge branch 'develop' of https://github.com/Frappet/bma-ehr-organization into develop
This commit is contained in:
commit
cc52890412
1 changed files with 2 additions and 2 deletions
|
|
@ -446,7 +446,7 @@ export class OrganizationUnauthorizeController extends Controller {
|
||||||
: null;
|
: null;
|
||||||
return {
|
return {
|
||||||
id: item.id,
|
id: item.id,
|
||||||
profileId: item.profileId,
|
profileId: item.current_holderId,
|
||||||
prefix: item.prefix,
|
prefix: item.prefix,
|
||||||
firstName: item.firstName,
|
firstName: item.firstName,
|
||||||
lastName: item.lastName,
|
lastName: item.lastName,
|
||||||
|
|
@ -867,7 +867,7 @@ export class OrganizationUnauthorizeController extends Controller {
|
||||||
? `(${this.textPointSummaryKpi(item.pointSum)})${item.pointSum}` //่join ธรรมดาดึง row ล่าสุดอยู่แล้ว
|
? `(${this.textPointSummaryKpi(item.pointSum)})${item.pointSum}` //่join ธรรมดาดึง row ล่าสุดอยู่แล้ว
|
||||||
: null;
|
: null;
|
||||||
return {
|
return {
|
||||||
profileId: item.id,
|
profileId: item.current_holderId,
|
||||||
salaryLevel: item.salaryLevel,
|
salaryLevel: item.salaryLevel,
|
||||||
group: item.group,
|
group: item.group,
|
||||||
prefix: item.prefix,
|
prefix: item.prefix,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue