Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 49s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 49s
This commit is contained in:
commit
325ba86c35
1 changed files with 0 additions and 40 deletions
|
|
@ -358,26 +358,6 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
params.root = orgDna.rootDnaId;
|
params.root = orgDna.rootDnaId;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (orgDna.child1DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child1DnaId = :child1");
|
|
||||||
params.child1 = orgDna.child1DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (orgDna.child2DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child2DnaId = :child2");
|
|
||||||
params.child2 = orgDna.child2DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (orgDna.child3DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child3DnaId = :child3");
|
|
||||||
params.child3 = orgDna.child3DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (orgDna.child4DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child4DnaId = :child4");
|
|
||||||
params.child4 = orgDna.child4DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (conditions.length > 0) {
|
if (conditions.length > 0) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
query: conditions.join(" AND "),
|
query: conditions.join(" AND "),
|
||||||
|
|
@ -717,26 +697,6 @@ export class KpiUserEvaluationController extends Controller {
|
||||||
params.root = orgDna.rootDnaId;
|
params.root = orgDna.rootDnaId;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (orgDna.child1DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child1DnaId = :child1");
|
|
||||||
params.child1 = orgDna.child1DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (orgDna.child2DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child2DnaId = :child2");
|
|
||||||
params.child2 = orgDna.child2DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (orgDna.child3DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child3DnaId = :child3");
|
|
||||||
params.child3 = orgDna.child3DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (orgDna.child4DnaId) {
|
|
||||||
conditions.push("kpiUserEvaluation.child4DnaId = :child4");
|
|
||||||
params.child4 = orgDna.child4DnaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (conditions.length > 0) {
|
if (conditions.length > 0) {
|
||||||
typeCondition = {
|
typeCondition = {
|
||||||
query: conditions.join(" AND "),
|
query: conditions.join(" AND "),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue