MT-28 fices for import

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php

@@ -163,19 +163,20 @@ class GranularImporter
     /**
      * @param $objectList
      * @param bool|false $generateUid
-     * @return array
+     * @return array|bool
      */
     public function validateImportData($objectList, $generateUid = false)
     {
         try {
-            if($generateUid == null){
+            if($generateUid){
                 foreach ($objectList as $rowObject) {
                     if($rowObject['name'] === 'PROCESSDEFINITION' && $rowObject['value'] == "replace"){
                         return true;
                     }
                 }
+                return false;
             }
-            return false;
+            return true;
         } catch (ExportException $e) {
             return array(
                     'success' => false,

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php

@@ -30,7 +30,7 @@ class ProcessDefinitionMigrator implements Importable, Exportable
             if ($replace) {
                 $this->bpmn->createFromStruct($data, false);
             } else {
-                $this->bpmn->updateFromStruct($data['PRJ_UID'], $data, false);
+                $this->bpmn->updateFromStruct($data['prj_uid'], $data, false);
             }
         } catch (\Exception $e) {
             return $e->getMessage();