From 2e38d1171ef6937708a4264860ff10f79a7cb1f0 Mon Sep 17 00:00:00 2001 From: devplant Date: Mon, 22 Nov 2021 11:45:29 +0200 Subject: [PATCH] RED-2661 Removing a dossier member or deleting a user must not change the status of a file - add check for null before overwritten the lastReviewer and lastAprrover --- .../peristence/v1/server/service/FileStatusService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index 6fe36ebb7..6e3a3d2ca 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -204,10 +204,10 @@ public class FileStatusService { FileEntity fileStatus = fileStatusPersistenceService.getStatus(fileId); String lastReviewer = fileStatus.getLastReviewer(); String lastApprover = fileStatus.getLastApprover(); - if(WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) { + if(StringUtils.isNotEmpty(currentReviewer) && WorkflowStatus.UNDER_REVIEW.equals(fileStatus.getWorkflowStatus())) { lastReviewer = currentReviewer; } - if(WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) { + if(StringUtils.isNotEmpty(currentReviewer) && WorkflowStatus.UNDER_APPROVAL.equals(fileStatus.getWorkflowStatus())) { lastApprover = currentReviewer; }