แก้ชื่อresponse
This commit is contained in:
parent
03084ca224
commit
320dd4616c
1 changed files with 4 additions and 4 deletions
|
|
@ -1296,13 +1296,13 @@ export class WorkflowController extends Controller {
|
||||||
.skip((body.page - 1) * body.pageSize)
|
.skip((body.page - 1) * body.pageSize)
|
||||||
.take(body.pageSize)
|
.take(body.pageSize)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
lists.map((x) => ({
|
const data = lists.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
posExecutiveNameOrg:
|
posExecutiveNameOrg:
|
||||||
x.posExecutiveName +
|
x.posExecutiveName +
|
||||||
(x.orgChild4 ?? x.orgChild3 ?? x.orgChild2 ?? x.orgChild1 ?? x.orgRoot ?? ""),
|
(x.orgChild4 ?? x.orgChild3 ?? x.orgChild2 ?? x.orgChild1 ?? x.orgRoot ?? ""),
|
||||||
}));
|
}));
|
||||||
return new HttpSuccess({ data: lists, total });
|
return new HttpSuccess({ data: data, total });
|
||||||
} else {
|
} else {
|
||||||
const [lists, total] = await AppDataSource.getRepository(viewDirector)
|
const [lists, total] = await AppDataSource.getRepository(viewDirector)
|
||||||
.createQueryBuilder("viewDirector")
|
.createQueryBuilder("viewDirector")
|
||||||
|
|
@ -1374,13 +1374,13 @@ export class WorkflowController extends Controller {
|
||||||
.skip((body.page - 1) * body.pageSize)
|
.skip((body.page - 1) * body.pageSize)
|
||||||
.take(body.pageSize)
|
.take(body.pageSize)
|
||||||
.getManyAndCount();
|
.getManyAndCount();
|
||||||
lists.map((x) => ({
|
const data = lists.map((x) => ({
|
||||||
...x,
|
...x,
|
||||||
posExecutiveNameOrg:
|
posExecutiveNameOrg:
|
||||||
x.posExecutiveName +
|
x.posExecutiveName +
|
||||||
(x.orgChild4 ?? x.orgChild3 ?? x.orgChild2 ?? x.orgChild1 ?? x.orgRoot ?? ""),
|
(x.orgChild4 ?? x.orgChild3 ?? x.orgChild2 ?? x.orgChild1 ?? x.orgRoot ?? ""),
|
||||||
}));
|
}));
|
||||||
return new HttpSuccess({ data: lists, total });
|
return new HttpSuccess({ data: data, total });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue