Merge branch 'develop' into dev

* develop:
  #2232
This commit is contained in:
Warunee Tamkoo 2026-01-26 20:43:07 +07:00
commit 7a62bc6977

View file

@ -68,27 +68,27 @@ export class StrategyController extends Controller {
order: child2.order,
children: child2.strategyChild3s
? child2.strategyChild3s.map((child3) => ({
id: child3.id,
level: 3,
name: child3.strategyChild3Name,
order: child3.order,
children: child3.strategyChild4s
? child3.strategyChild4s.map((child4) => ({
id: child4.id,
level: 4,
name: child4.strategyChild4Name,
order: child4.order,
children: child4.strategyChild5s
? child4.strategyChild5s.map((child5) => ({
id: child5.id,
level: 5,
name: child5.strategyChild5Name,
order: child5.order,
}))
: [],
id: child3.id,
level: 3,
name: child3.strategyChild3Name,
order: child3.order,
children: child3.strategyChild4s
? child3.strategyChild4s.map((child4) => ({
id: child4.id,
level: 4,
name: child4.strategyChild4Name,
order: child4.order,
children: child4.strategyChild5s
? child4.strategyChild5s.map((child5) => ({
id: child5.id,
level: 5,
name: child5.strategyChild5Name,
order: child5.order,
}))
: [],
}))
: [],
}))
: [],
}))
: [],
})),
}));
@ -119,9 +119,18 @@ export class StrategyController extends Controller {
order: "ASC",
strategyChild2s: {
order: "ASC",
createdAt: "ASC",
strategyChild3s: {
order: "ASC",
strategyChild4s: { order: "ASC", strategyChild5s: { order: "ASC" } },
createdAt: "ASC",
strategyChild4s: {
order: "ASC",
createdAt: "ASC",
strategyChild5s: {
order: "ASC",
createdAt: "ASC"
}
},
},
},
},
@ -143,27 +152,27 @@ export class StrategyController extends Controller {
order: child2.order,
children: child2.strategyChild3s
? child2.strategyChild3s.map((child3) => ({
id: child3.id,
level: 3,
name: child3.strategyChild3Name,
order: child3.order,
children: child3.strategyChild4s
? child3.strategyChild4s.map((child4) => ({
id: child4.id,
level: 4,
name: child4.strategyChild4Name,
order: child4.order,
children: child4.strategyChild5s
? child4.strategyChild5s.map((child5) => ({
id: child5.id,
level: 5,
name: child5.strategyChild5Name,
order: child5.order,
}))
: [],
id: child3.id,
level: 3,
name: child3.strategyChild3Name,
order: child3.order,
children: child3.strategyChild4s
? child3.strategyChild4s.map((child4) => ({
id: child4.id,
level: 4,
name: child4.strategyChild4Name,
order: child4.order,
children: child4.strategyChild5s
? child4.strategyChild5s.map((child5) => ({
id: child5.id,
level: 5,
name: child5.strategyChild5Name,
order: child5.order,
}))
: [],
}))
: [],
}))
: [],
}))
: [],
})),
}));
@ -208,27 +217,27 @@ export class StrategyController extends Controller {
order: child2.order,
children: child2.strategyChild3s
? child2.strategyChild3s.map((child3) => ({
id: child3.id,
level: 3,
name: child3.strategyChild3Name,
order: child3.order,
children: child3.strategyChild4s
? child3.strategyChild4s.map((child4) => ({
id: child4.id,
level: 4,
name: child4.strategyChild4Name,
order: child4.order,
children: child4.strategyChild5s
? child4.strategyChild5s.map((child5) => ({
id: child5.id,
level: 5,
name: child5.strategyChild5Name,
order: child5.order,
}))
: [],
id: child3.id,
level: 3,
name: child3.strategyChild3Name,
order: child3.order,
children: child3.strategyChild4s
? child3.strategyChild4s.map((child4) => ({
id: child4.id,
level: 4,
name: child4.strategyChild4Name,
order: child4.order,
children: child4.strategyChild5s
? child4.strategyChild5s.map((child5) => ({
id: child5.id,
level: 5,
name: child5.strategyChild5Name,
order: child5.order,
}))
: [],
}))
: [],
}))
: [],
}))
: [],
})),
}));