Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/airport/drone/QueryDroneDataService.java

@@ -44,9 +44,7 @@ public class QueryDroneDataService {
         // 读取不同租户的机场平台url
         User user = ShiroUtils.getUserInfo();
         Integer tenantId = user.getTenantId();
-
         this.check(airportId);
-
         ThMission mission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>()
                 .eq(ThMission::getTenantId, tenantId)
                 .eq(ThMission::getAirportId, airportId)
@@ -55,19 +53,14 @@ public class QueryDroneDataService {
         if (ObjectUtil.isNull(mission)) {
             log.info("获取无人机数据信息, 没有正在飞行的任务");
 //            throw new ServiceException("没有正在飞行的任务");
-            JsonResult.success("没有正在飞行的任务");
+            return JsonResult.success("没有正在飞行的任务");
         }
-
-        log.info("获取无人机数据信息1, missionId={}, emergencyDataMissionId={}", mission.getId(), mission.getEmergencyDataMissionId());
-
         Integer missionId;
         if (0 == mission.getEmergencyDataMissionId()) {
             missionId = mission.getId();
         } else {
             missionId = mission.getEmergencyDataMissionId();
         }
-        log.info("获取无人机数据信息2, missionId={}", missionId);
-
         Map<String, Object> map = new HashMap<>();
         map.put("id", missionId);
         map.put("tenantId", tenantId);