机型机号导入

als-modules/agile-assurance/src/main/java/org/eco/als/listener/AircraftImportListener.java

@@ -48,9 +48,10 @@ public class AircraftImportListener extends AnalysisEventListener<AircraftImport
             QueryWrapper queryWrapper = QueryWrapper.create();
             queryWrapper.where("name = ?" , aircraftBo.getName());
             queryWrapper.and("parent_name = ?" , aircraftBo.getParentName());
-            AircraftVo aircraftVo2 = aircraftService.getOneAs(queryWrapper, AircraftVo.class);
+            queryWrapper.or("(name = ?", aircraftBo.getName()).and("parent_id = ?)", 0);
+            AircraftVo aircraftVo1 = aircraftService.getOneAs(queryWrapper, AircraftVo.class);
             AircraftVo pAircraftVo = aircraftService.selectByName(aircraftBo.getParentName());
-            if (ObjectUtil.isNull(aircraftVo2)) {
+            if (ObjectUtil.isNull(aircraftVo1)) {
                 //不存在就新增
                 aircraftBo.setVersion(0);
                 aircraftBo.setCreateBy(loginUser.getUserId());
@@ -69,7 +70,8 @@ public class AircraftImportListener extends AnalysisEventListener<AircraftImport
                 }
             } else if (isUpdateSupport) {
                 //存在就更新
-                aircraftBo.setVersion(aircraftVo2.getVersion());
+                aircraftBo.setId(aircraftVo1.getId());
+                aircraftBo.setVersion(aircraftVo1.getVersion());
                 boolean updated = aircraftService.update(aircraftBo);
                 if (updated) {
                     successNum++;