Merge branch 'dev_bugfix_orderdetail0620' into 'develop'

修改，避免label的value为null情况

See merge request !121

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderAssignImpl.java

@@ -67,7 +67,7 @@ public class OrderAssignImpl implements OrderAssign {
 			// 获取订单tips
 			// 获取订单tips
 			HashMap<String, List<LabelValueDTO>> orderTips = new HashMap<>();
 			HashMap<String, List<LabelValueDTO>> orderTips = new HashMap<>();
 			List<String> orderIds = orderAppointments.stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
 			List<String> orderIds = orderAppointments.stream().map(OrderAppointment::getOrderId).collect(Collectors.toList());
-			if(!orderIds.isEmpty()) {
+			if (!orderIds.isEmpty()) {
 				List<OrderRequest> orders = this.queryOrderRequestsByOrderIds(orderIds);
 				List<OrderRequest> orders = this.queryOrderRequestsByOrderIds(orderIds);
 				orderTips = this.packOrderTips(orders);
 				orderTips = this.packOrderTips(orders);
 			}
 			}
@@ -221,7 +221,7 @@ public class OrderAssignImpl implements OrderAssign {
 	private LabelValueDTO packLabelValue(String label, String value) {
 	private LabelValueDTO packLabelValue(String label, String value) {
 		LabelValueDTO item = new LabelValueDTO();
 		LabelValueDTO item = new LabelValueDTO();
 		item.setLabel(label);
 		item.setLabel(label);
-		item.setValue(value);
+		item.setValue((value == null) ? "" : value);
 		return item;
 		return item;
 	}
 	}
 }
 }