Merge branch '1064455_FixDuplicateEmployeeContactIdUpdate' into '2020.2.0'

[Projekt: Entwicklung - Neon][TicketNr.: 1064455][Dubletten-Integration bei...

See merge request xrm/basic!383

entity/Person_entity/entityfields/duplicateactions/children/integratecurrentintoselectedaction/onActionProcess.js

+import("system.tools");
 import("Employee_lib");
 import("system.vars");
 import("system.neon");
@@ -11,6 +12,12 @@ var mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetCont
 
 if(mergeSuccess)
 {
+    var user = tools.getUserByAttribute(tools.CONTACTID, sourceContactId);
+    
+    if (user) {
+    user[tools.PARAMS][tools.CONTACTID] = targetContactId;
+    tools.updateUser(user);
+    }
     var currentContactId = EmployeeUtils.getCurrentContactId();
     if(currentContactId == null)
         currentContactId = "";

entity/Person_entity/entityfields/duplicateactions/children/integrateselectedintocurrentaction/onActionProcess.js

+import("system.tools");
 import("system.db");
 import("Employee_lib");
 import("KeywordRegistry_basic");
@@ -15,6 +16,12 @@ var mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetCont
 
 if(mergeSuccess)
 {
+    var user = tools.getUserByAttribute(tools.CONTACTID, sourceContactId);
+    
+    if (user) {
+    user[tools.PARAMS][tools.CONTACTID] = targetContactId;
+    tools.updateUser(user);
+    }
     var currentContactId = EmployeeUtils.getCurrentContactId();
     if(currentContactId == null)
         currentContactId = "";