fix person: organisation contact id

entity/Person_entity/Person_entity.aod

@@ -1158,6 +1158,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           <name>OrganisationContactId.value</name>
           <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisationcontactid.value/expression.js</expression>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_CONTACTID.displayValue</name>
+          <recordfield>ORGANISATION.NAME</recordfield>
+        </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_CONTACTID.value</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisation_contactid.value/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>

entity/Person_entity/entityfields/organisation_contactid/valueProcess.js

@@ -10,8 +10,4 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.v
     {
         result.string(ContactUtils.getOrgContactId(vars.get("$param.OrgId_param")));
     }
-}
-else if (vars.get("$this.value") == null)
-{                                                              // V--- Prevent cyclic dependencies.
-    result.string(ContactUtils.getOrgContactId(vars.get("$field." + "ORGANISATION_ID")));
 }
\ No newline at end of file

entity/Person_entity/recordcontainers/db/recordfieldmappings/organisation_contactid.value/expression.js

+import("system.result");
+
+result.string("select CONTACT.CONTACTID from CONTACT where CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
\ No newline at end of file