Merge branch '#1065468_LeadimportReset_MariaDBBugfix' into '2020.2.0'

#1065468_LeadimportReset_MariaDBBugfix Änderung am Delete

See merge request xrm/basic!378

entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js

@@ -22,14 +22,14 @@ _deleteData("COMMUNICATION", leadimportId, dateADayBefore);
 _deleteData("AB_ATTRIBUTERELATION", leadimportId, dateADayBefore);
 
 newWhere("LEADLOG.LEADIMPORT_ID", leadimportId)
-.and("LEADLOG.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-.from("LEADLOG")
-.deleteData();
+    .and("LEADLOG.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+    .from("LEADLOG")
+    .deleteData();
 
 newWhere("LEAD.LEADIMPORT_ID", leadimportId)
-.and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
-.from("LEAD")
-.deleteData();
+    .and("LEAD.DATE_NEW", dateADayBefore.getTime(), "# >= ?")
+    .from("LEAD")
+    .deleteData();
 // Ändern des Status auf Created
 newWhere("LEADIMPORT.LEADIMPORTID", leadimportId).updateData(true, "LEADIMPORT", ["Status"], null, [$KeywordRegistry.importStatus$created()]);
 
@@ -46,12 +46,15 @@ function _deleteData (pTableName, pleadimportId, pdateADayBefor)
 {
     let uTableName = pTableName.charAt(0);
     newWhere(pTableName + "." + pTableName + "ID", 
-        newSelect(uTableName + "." + pTableName + "ID")
-        .from(pTableName, uTableName)
-        .join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
-        .where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
-        .and("LEADLOG.LEADIMPORT_ID", pleadimportId)
-        .and("LEADLOG.DATE_NEW", pdateADayBefor.getTime(), "# >= ?"), SqlBuilder.IN())
+        newSelect("TAB." + pTableName + "ID")
+        .from(
+            newSelect(uTableName + "." + pTableName + "ID")
+            .from(pTableName, uTableName)
+            .join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
+            .where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
+            .and("LEADLOG.LEADIMPORT_ID", pleadimportId)
+            .and("LEADLOG.DATE_NEW", pdateADayBefor.getTime(),SqlBuilder.GREATER_OR_EQUAL())
+        , "TAB"), SqlBuilder.IN())
     .from(pTableName)
     .deleteData();
 }
\ No newline at end of file