From 4dd0a6c2107f981b31ca49cf5b5167880022ed63 Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Wed, 24 Apr 2019 13:45:09 +0400
Subject: [PATCH] fix merge bug

---
 src/main/java/ru/ulstu/grant/service/GrantService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index ea5a994..1f0b6ce 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -93,7 +93,7 @@ public class GrantService {
         }
         grant.getPapers().clear();
         if (grantDto.getPaperIds() != null && !grantDto.getPaperIds().isEmpty()) {
-            grantDto.getPaperIds().forEach(paperIds -> grant.getPapers().add(paperService.findEntityById(paperIds)));
+            grantDto.getPaperIds().forEach(paperIds -> grant.getPapers().add(paperService.findPaperById(paperIds)));
         }
         return grant;
     }