Merge branch 'develop-Bright' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 59s
This commit is contained in:
commit
7b46077dc4
1 changed files with 5 additions and 3 deletions
|
|
@ -1248,8 +1248,8 @@ export class ReportController extends Controller {
|
||||||
{ probation_status: 9 },
|
{ probation_status: 9 },
|
||||||
);
|
);
|
||||||
|
|
||||||
// 2) return data ให้ org ทำงานต่อ
|
// 2) return data ห่อใน result ให้ org ทำงานต่อ
|
||||||
return body.refIds.map((v) => ({
|
const result = body.refIds.map((v) => ({
|
||||||
profileId: v.refId,
|
profileId: v.refId,
|
||||||
commandId: v.commandId,
|
commandId: v.commandId,
|
||||||
amount: v.amount,
|
amount: v.amount,
|
||||||
|
|
@ -1264,6 +1264,7 @@ export class ReportController extends Controller {
|
||||||
commandName: v.commandName,
|
commandName: v.commandName,
|
||||||
remark: v.remark,
|
remark: v.remark,
|
||||||
}));
|
}));
|
||||||
|
return { result };
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
if (error instanceof HttpError) {
|
if (error instanceof HttpError) {
|
||||||
throw error;
|
throw error;
|
||||||
|
|
@ -1395,7 +1396,7 @@ export class ReportController extends Controller {
|
||||||
);
|
);
|
||||||
|
|
||||||
// 2) return data ให้ org ทำงานต่อ
|
// 2) return data ให้ org ทำงานต่อ
|
||||||
return body.refIds.map((v) => ({
|
const result = body.refIds.map((v) => ({
|
||||||
profileId: v.refId,
|
profileId: v.refId,
|
||||||
commandId: v.commandId,
|
commandId: v.commandId,
|
||||||
amount: v.amount,
|
amount: v.amount,
|
||||||
|
|
@ -1411,6 +1412,7 @@ export class ReportController extends Controller {
|
||||||
commandName: v.commandName,
|
commandName: v.commandName,
|
||||||
remark: v.remark,
|
remark: v.remark,
|
||||||
}));
|
}));
|
||||||
|
return { result };
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
if (error instanceof HttpError) {
|
if (error instanceof HttpError) {
|
||||||
throw error;
|
throw error;
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue