RED-2661 - Removing a dossier member or deleting a user must not change the status of a file

- update correctly the lastReviewer and lastApprover in case the assignee is set to null
This commit is contained in:
devplant 2021-12-06 12:15:16 +02:00
parent a65a916338
commit 238de2bfc0

View File

@ -204,11 +204,11 @@ public class FileStatusService {
FileEntity fileStatus = fileStatusPersistenceService.getStatus(fileId);
String lastReviewer = fileStatus.getLastReviewer();
String lastApprover = fileStatus.getLastApprover();
if(StringUtils.isNotEmpty(assignee) && WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) {
lastReviewer = assignee;
if(WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) {
lastReviewer = StringUtils.isNotEmpty(assignee)? assignee: fileStatus.getAssignee();
}
if(StringUtils.isNotEmpty(assignee) && WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) {
lastApprover = assignee;
if(WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) {
lastApprover = StringUtils.isNotEmpty(assignee)? assignee: fileStatus.getAssignee();
}
fileStatusPersistenceService.setAssignee(fileId, assignee, lastReviewer, lastApprover);