日语培训查询

Edu.Repository/Course/RB_OrderRepository.cs

@@ -153,7 +153,14 @@ where {where} order by {orderBy}
             }
             if (!string.IsNullOrEmpty(demodel.GuestName)) 
             {
-                where += $@" o.OrderId in (select OrderId from rb_order_guest where Status =0 and GuestName like '%{demodel.GuestName}%')";
+                if (demodel.Group_Id > 0)
+                {
+                    where += $@" and o.OrderId in (select OrderId from rb_order_guest where Status =0 and Group_Id ={demodel.Group_Id} and GuestName like '%{demodel.GuestName}%')";
+                }
+                else
+                {
+                    where += $@" and o.OrderId in (select OrderId from rb_order_guest where Status =0 and GuestName like '%{demodel.GuestName}%')";
+                }
             }
             if (demodel.CouseId > 0)
             {

Edu.WebApi/Controllers/Course/OrderController.cs

@@ -320,6 +320,7 @@ namespace Edu.WebApi.Controllers.Course
                 OrderInfo = new
                 {
                     model.OrderId,
+                    model.ClassId,
                     model.GuestNum,
                     model.Class_Price,
                     model.Unit_Price,