From a94b76194f8116e8c92823438b286fc207125f2e Mon Sep 17 00:00:00 2001
From: Benjamin Qin <benjamin.qin@gmail.com>
Date: Sat, 12 Jun 2021 00:16:40 +0900
Subject: [PATCH] fix wrong otherEntityName in relationship setter

---
 .../templates/src/main/java/package/domain/Entity.java.ejs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs
index 95534a45052..2a2ac4c7a5f 100644
--- a/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs
+++ b/generators/entity-server/templates/src/main/java/package/domain/Entity.java.ejs
@@ -685,11 +685,11 @@ _%>
             this.<%= relationshipFieldName %>.set<%= otherEntityRelationshipNameCapitalized %>(null);
       <%_ } _%>
         }
-        if (<%= relationshipFieldName %> != null) {
+        if (<%= otherEntityName %> != null) {
       <%_ if (relationship.otherRelationship.reference.collection) { _%>
-            <%= relationshipFieldName %>.add<%= otherEntityRelationshipNameCapitalized %>(this);
+            <%= otherEntityName %>.add<%= otherEntityRelationshipNameCapitalized %>(this);
       <%_ } else { _%>
-            <%= relationshipFieldName %>.set<%= otherEntityRelationshipNameCapitalized %>(this);
+            <%= otherEntityName %>.set<%= otherEntityRelationshipNameCapitalized %>(this);
       <%_ } _%>
         }
     <%_ } _%>