Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/details/WarningDetailsService.java

@@ -57,8 +57,9 @@ public class WarningDetailsService {
     private UserMapper userMapper;
 
     public JsonResult details(Integer id) {
-       User user = ShiroUtils.getUserInfo();
-       Integer tenantId = user.getTenantId();
+        User user = ShiroUtils.getUserInfo();
+        Integer tenantId = user.getTenantId();
+
         //校验
         if(null == id){
             throw new ServiceException(ServiceExceptionEnum.PARAMETER_IS_NULL);
@@ -97,7 +98,7 @@ public class WarningDetailsService {
                 warningRecordVO.setRecordStartTime(x.getCreateTime());
                 //巡检机场名称
                 ThMission thMission = missionMapper.selectOne(new LambdaQueryWrapper<ThMission>()
-                        .eq(ThMission::getId, x.getMissionId())
+                        .eq(ThMission::getId, x.getEmergencyMissionId())
                         .eq(ThMission::getMark, 1));
                 if (ObjectUtils.isNotEmpty(thMission)) {
                     //获取巡检机场