Merge branch 'od_relate' into pre

netflix-web/src/main/java/com/cyksj/web/controller/manage/CmsOrderController.java

@@ -792,7 +792,7 @@ public class CmsOrderController {
 	public Result<String> setOrderCustomerService(@RequestBody OrderDonCustomerServiceRelate relate) {
 		OrderDonCustomerServiceRelate orderDonCustomerServiceRelate = orderDonCustomerServiceRelateMapper.selectOne(Wrappers.lambdaQuery(OrderDonCustomerServiceRelate.class)
 				.eq(OrderDonCustomerServiceRelate::getOrderId, relate.getOrderId()).last("limit 1"));
-		if (orderDonCustomerServiceRelate == null) {
+		if (orderDonCustomerServiceRelate != null) {
 			relate.setId(orderDonCustomerServiceRelate.getId());
 		}
 		try {