cfiController Проверка на удаление

2026-03-27 19:45:43 +03:00 · 2026-01-29 16:38:55 +03:00
parent 2a13f63fcc
commit b4d796d8be
1 changed files with 12 additions and 0 deletions
--- a/LibServer/cficontroller/cficontroller.cpp
+++ b/LibServer/cficontroller/cficontroller.cpp
@@ -210,6 +210,18 @@ bool CfiController::parsingCfiXML_DOM(QDomDocument &domDoc, QMap<int, CfiObject>

 bool CfiController::merge2map(QMap<int, CfiObject> &mapCfiObjects_orig, QMap<int, CfiObject> &mapCfiObjects_new)
 {
+    //Проверка на удаление
+    for(CfiObject cfiObj : mapCfiObjects_orig)
+    {
+        int id = cfiObj.getId();
+
+        if(!mapCfiObjects_new.contains(id))
+        {//Удаляем
+            mapCfiObjects_orig.take(id);
+        }
+    }
+
+    //Замена, Добавление
    for(CfiObject cfiObj : mapCfiObjects_new)
    {
        int id = cfiObj.getId();