Merge pull request #2159 from TexasDigitalLibrary/main_2092

match workflow steps and take out getOverrideable()

Author: cstarcher

src/main/java/org/tdl/vireo/model/inheritance/HeritableRepoImpl.java

@@ -38,7 +38,7 @@ public void removeFromWorkflowStep(Organization requestingOrganization, Workflow
         // if requesting organization originates the workflow step or the workflow step is overrideable,
         if (pendingWorkflowStep.getOriginatingOrganization().getId().equals(requestingOrganization.getId()) || pendingWorkflowStep.getOverrideable()) {
             // ... and if also that workflow step originates the heritableModel or the heritableModel is overrideable,
-            if (heritableModelToRemove.getOriginatingWorkflowStep().getId().equals(heritableModelToRemove.getId()) || heritableModelToRemove.getOverrideable()) {
+            if(heritableModelToRemove.getOriginatingWorkflowStep() != null && heritableModelToRemove.getOriginatingWorkflowStep().getId().equals(pendingWorkflowStep.getId())){
                 // ...then the update is permissible.
 
                 // if requesting organization is not the workflow step's orignating organization,