เพิ่มdna
This commit is contained in:
parent
f36594266c
commit
c57553e044
2 changed files with 56 additions and 16 deletions
|
|
@ -96,8 +96,8 @@ export class EvaluationController {
|
|||
.andWhere(
|
||||
_data.root != undefined && _data.root != null
|
||||
? _data.root[0] != null
|
||||
? `evaluation.rootId IN (:...root)`
|
||||
: `evaluation.rootId is null`
|
||||
? `evaluation.rootDnaId IN (:...root)`
|
||||
: `evaluation.rootDnaId is null`
|
||||
: "1=1",
|
||||
{
|
||||
root: _data.root,
|
||||
|
|
@ -106,8 +106,8 @@ export class EvaluationController {
|
|||
.andWhere(
|
||||
_data.child1 != undefined && _data.child1 != null
|
||||
? _data.child1[0] != null
|
||||
? `evaluation.child1Id IN (:...child1)`
|
||||
: `evaluation.child1Id is null`
|
||||
? `evaluation.child1DnaId IN (:...child1)`
|
||||
: `evaluation.child1DnaId is null`
|
||||
: "1=1",
|
||||
{
|
||||
child1: _data.child1,
|
||||
|
|
@ -116,8 +116,8 @@ export class EvaluationController {
|
|||
.andWhere(
|
||||
_data.child2 != undefined && _data.child2 != null
|
||||
? _data.child2[0] != null
|
||||
? `evaluation.child2Id IN (:...child2)`
|
||||
: `evaluation.child2Id is null`
|
||||
? `evaluation.child2DnaId IN (:...child2)`
|
||||
: `evaluation.child2DnaId is null`
|
||||
: "1=1",
|
||||
{
|
||||
child2: _data.child2,
|
||||
|
|
@ -126,8 +126,8 @@ export class EvaluationController {
|
|||
.andWhere(
|
||||
_data.child3 != undefined && _data.child3 != null
|
||||
? _data.child3[0] != null
|
||||
? `evaluation.child3Id IN (:...child3)`
|
||||
: `evaluation.child3Id is null`
|
||||
? `evaluation.child3DnaId IN (:...child3)`
|
||||
: `evaluation.child3DnaId is null`
|
||||
: "1=1",
|
||||
{
|
||||
child3: _data.child3,
|
||||
|
|
@ -136,8 +136,8 @@ export class EvaluationController {
|
|||
.andWhere(
|
||||
_data.child4 != undefined && _data.child4 != null
|
||||
? _data.child4[0] != null
|
||||
? `evaluation.child4Id IN (:...child4)`
|
||||
: `evaluation.child4Id is null`
|
||||
? `evaluation.child4DnaId IN (:...child4)`
|
||||
: `evaluation.child4DnaId is null`
|
||||
: "1=1",
|
||||
{
|
||||
child4: _data.child4,
|
||||
|
|
@ -634,11 +634,11 @@ export class EvaluationController {
|
|||
.GetData(request, `/org/profile/keycloak/commander/${request.user.sub}`)
|
||||
.then(async (x) => {
|
||||
org = x.org;
|
||||
evaluation.rootId = x.rootId;
|
||||
evaluation.child1Id = x.child1Id;
|
||||
evaluation.child2Id = x.child2Id;
|
||||
evaluation.child3Id = x.child3Id;
|
||||
evaluation.child4Id = x.child4Id;
|
||||
evaluation.rootDnaId = x.rootDnaId;
|
||||
evaluation.child1DnaId = x.child1DnaId;
|
||||
evaluation.child2DnaId = x.child2DnaId;
|
||||
evaluation.child3DnaId = x.child3DnaId;
|
||||
evaluation.child4DnaId = x.child4DnaId;
|
||||
})
|
||||
.catch();
|
||||
//Evaluation
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue