Merge branch '1061334_FixObjectContentProcessExcludeIds' into '2020.2'

[Projekt: Entwicklung - Neon][TicketNr.: 1061334][Object_entity - contentProcess]

See merge request xrm/basic!444

entity/Object_entity/recordcontainers/jdito/contentProcess.js

@@ -19,8 +19,8 @@ if (vars.get("$param.ObjectType_param"))
     if (vars.exists("$param.ContactId") && vars.get("$param.ContactId"))
         contactId = vars.get("$param.ContactId");
     
-    result.object(db.table(ContextUtils.getContextDataSql(objectType, contactId, false, undefined, false, excludedIds)))
-} 
+    result.object(db.table(ContextUtils.getContextDataSql(objectType, contactId, false, undefined, false, null, null, excludedIds)))
+}
 else
 {
     result.object([]);

process/Context_lib/process.js

@@ -662,7 +662,7 @@ ContextUtils.getContactId = function(pContextId, pRowId)
  * nur 360
  * 
  */
-ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pWithGroupBy, pUidsForFiltering)
+ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pActive, pWithState, pWithGroupBy, pUidsForFiltering, pExcludeIds)
 {
     var selectMap = ContextUtils.getSelectMap();
     var ownContextSelector = selectMap[pContextId];
@@ -690,7 +690,8 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
     var contextDataSelect = newSelect( columns.join(", ") )
                                 .from(ownContextSelector.getFullFromClause())
                                 .where(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId, SqlBuilder.IN())
-                                .andIfSet(ownContextSelector.getFullIdField(), pUidsForFiltering, SqlBuilder.IN());
+                                .andIfSet(ownContextSelector.getFullIdField(), pUidsForFiltering, SqlBuilder.IN())
+                                .andIfSet(ownContextSelector.getFullIdField(), pExcludeIds, SqlBuilder.NOT_IN());
     
     if (pActive != undefined)
     {