Person: removed unnecessary sqls for resolving an organisation name

(cherry picked from commit 06a6934e)

entity/Person_entity/Person_entity.aod

@@ -847,7 +847,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <consumer>Organisations</consumer>
       <linkedContextProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/linkedContextProcess.js</linkedContextProcess>
       <valueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/valueProcess.js</valueProcess>
-      <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/displayValueProcess.js</displayValueProcess>
       <onValidation>%aditoprj%/entity/Person_entity/entityfields/organisation_contactid/onValidation.js</onValidation>
     </entityField>
     <entityParameter>
@@ -1347,10 +1346,6 @@ 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>
@@ -1396,6 +1391,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           <name>STANDRAD_ZIP.value</name>
           <recordfield>ADDRESS.ZIP</recordfield>
         </dbRecordFieldMapping>
+        <dbRecordFieldMapping>
+          <name>ORGANISATION_CONTACTID.displayValue</name>
+          <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/organisation_contactid.displayvalue/expression.js</expression>
+        </dbRecordFieldMapping>
       </recordFieldMappings>
       <filterExtensions>
         <filterExtensionSet>

entity/Person_entity/entityfields/organisation_contactid/displayValueProcess.js

-import("system.result");
-import("system.db");
-import("system.vars");
-import("Contact_lib");
-
-var orgContactId = vars.get("$field.ORGANISATION_CONTACTID");
-var res = OrganisationUtils.getNameByContactId(orgContactId);
-
-result.string(res);
\ No newline at end of file

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

+import("system.result");
+
+result.string("ORGANISATION.NAME");
\ No newline at end of file