:ambulance: 订单恢复健壮性修改

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/admin_order/service/impl/AdminOrderServiceImpl.java

@@ -114,17 +114,25 @@ public class AdminOrderServiceImpl extends ServiceImpl<AdminOrderMapper, AdminOr
         adminOrderExamineQueryWapper.select("order_id, order_num, max(create_time) as create_time, jiaochu_or_jieshou");
         adminOrderExamineQueryWapper.eq("order_num", adminOrder.getOrderNum());
         AdminOrderExamine adminOrderExamine = adminOrderExamineMapper.selectOne(adminOrderExamineQueryWapper);
-        if ("交出".equals(adminOrderExamine.getJiaochuOrJieshou())) {
-            adminOrder.setType("待接收");
-        } else if ("接收".equals(adminOrderExamine.getJiaochuOrJieshou())) {
-            adminOrder.setType("待交出");
+        if (adminOrderExamine != null) {
+            if ("交出".equals(adminOrderExamine.getJiaochuOrJieshou())) {
+                adminOrder.setType("待接收");
+            } else if ("接收".equals(adminOrderExamine.getJiaochuOrJieshou())) {
+                adminOrder.setType("待交出");
+            } else {
+                result.setMessage("无法恢复订单，无订单校验记录");
+                return result;
+            }
         } else {
-            result.setMessage("无法恢复订单，无订单校验记录");
-            return result;
+            //首次发起交接无订单动态
+            adminOrder.setType("待交出");
         }
 
+
         //安检
         AdminSecurityCheck adminSecurityCheck = new AdminSecurityCheck();
+        // 订单id和安检的id居然一样，离谱
+        adminSecurityCheck.setId(adminOrder.getId());
         adminSecurityCheck.setOrderNum(adminOrder.getOrderNum());
         adminSecurityCheck.setAircraftNum(adminOrder.getAircraftNum());
         adminSecurityCheck.setAircraftPositionNum(adminOrder.getAircraftPositionNum());