taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed/modified setApprovalFlag

main
Said Gedik 2023-05-24 12:43:20 +02:00
parent 4ecaea20f8
commit 64b0916970
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
backend/src/main/java/com/nttdata/calender/changes/Change.java
View File

@ -135,21 +135,21 @@ public class Change {
change.setChangeImplementerPersonId(getValueStringByID(entry, "ChangeImplementerPersonId"));
change.setPackageType(getValueStringByID(entry, "PackageType"));
change.setContract(getValueStringByID(entry, "Contract"));
try {
change.setApprovalFlag(inApprovalList(api.getUser(), getValueStringByID(entry, "ChangerNr")));
} catch (ARException e) {
e.printStackTrace();
}
change.setImplementerEdit(
Optional.ofNullable(entry.get(queryChange.getFieldId("ChangeCoordinator")))
.map(Object::toString)
.filter(peopleFullName::equals)
.isPresent());
try {
var flag = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr"));
change.setApprovalFlag(flag);
} catch (ARException e) {
e.printStackTrace();
}
changes.add(change);
});
api.freeImpersonatedUser();
return new ChangeResponse(entriesSize, changes);
}
@ -160,8 +160,8 @@ public class Change {
var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"",
queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
String approvers = approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
return approvers.contains(user);
var approvers = !approversOI.isEmpty() ? approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString() : null;
return approvers != null ? approvers.contains(user) : false;
}
/**