修复活动订单导出的异常

src/main/java/com/ctrip/fun/admin/controller/order/OpVoucherOrderController.java

@@ -96,13 +96,14 @@ public class OpVoucherOrderController extends AbstractOpOrderController<VoucherO
 
 
         StringBuilder excel = new StringBuilder("/voucherOrder/excel/" + listType + "?");
         StringBuilder excel = new StringBuilder("/voucherOrder/excel/" + listType + "?");
         String userName = (form.getUserName() == null) ? ("") : (form.getUserName());
         String userName = (form.getUserName() == null) ? ("") : (form.getUserName());
+        String orderName = (form.getOrderName() == null) ? ("") : (form.getOrderName());
         String recommendUserName = (form.getRecommendUserName() == null) ? ("") : (form.getRecommendUserName());
         String recommendUserName = (form.getRecommendUserName() == null) ? ("") : (form.getRecommendUserName());
         String recommendPhone = (form.getRecommendPhone() == null) ? ("") : (form.getRecommendPhone());
         String recommendPhone = (form.getRecommendPhone() == null) ? ("") : (form.getRecommendPhone());
         String userId = (form.getUserId() == null) ? ("") : (form.getUserId());
         String userId = (form.getUserId() == null) ? ("") : (form.getUserId());
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         String orderStartDate = (form.getOrderStartDate() == null) ? ("") : (format.format(form.getOrderStartDate()));
         String orderStartDate = (form.getOrderStartDate() == null) ? ("") : (format.format(form.getOrderStartDate()));
         String orderEndDate = (form.getOrderEndDate() == null) ? ("") : (format.format(form.getOrderEndDate()));
         String orderEndDate = (form.getOrderEndDate() == null) ? ("") : (format.format(form.getOrderEndDate()));
-        excel.append("orderNo=").append(form.getOrderNo()).append("&orderName=").append(form.getOrderName()).append("&userId=").append(userId).append("&userName=").append(userName).append("&orderStartDate=").append(orderStartDate)
+        excel.append("orderNo=").append(form.getOrderNo()).append("&orderName=").append(orderName).append("&userId=").append(userId).append("&userName=").append(userName).append("&orderStartDate=").append(orderStartDate)
                 .append("&orderEndDate=").append(orderEndDate).append("&total=").append(total).append("&recommendPhone=").append(recommendPhone).append("&recommendUserName=").append(recommendUserName);
                 .append("&orderEndDate=").append(orderEndDate).append("&total=").append(total).append("&recommendPhone=").append(recommendPhone).append("&recommendUserName=").append(recommendUserName);
         model.put("excelpath", excel.toString());
         model.put("excelpath", excel.toString());