Commit 575acd28 authored by 黄奎's avatar 黄奎

页面修改

parent 4fabaab2
...@@ -358,10 +358,10 @@ FROM ...@@ -358,10 +358,10 @@ FROM
{ {
where.AppendFormat(" AND B.{0}={1} ", nameof(Employee_ViewModel.Group_Id), query.Group_Id); where.AppendFormat(" AND B.{0}={1} ", nameof(Employee_ViewModel.Group_Id), query.Group_Id);
} }
if (query.School_Id > -1) //if (query.School_Id > -1)
{ //{
where.AppendFormat(" AND B.{0}={1} ", nameof(Employee_ViewModel.School_Id), query.School_Id); // where.AppendFormat(" AND B.{0}={1} ", nameof(Employee_ViewModel.School_Id), query.School_Id);
} //}
if (!string.IsNullOrWhiteSpace(query.Account)) if (!string.IsNullOrWhiteSpace(query.Account))
{ {
where.AppendFormat(" AND A.{0}='{1}' ", nameof(Employee_ViewModel.Account), query.Account.Trim()); where.AppendFormat(" AND A.{0}='{1}' ", nameof(Employee_ViewModel.Account), query.Account.Trim());
......
...@@ -371,10 +371,11 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState <>2 ...@@ -371,10 +371,11 @@ WHERE o.OrderState=1 and og.`Status`=0 and sog.`Status`=0 and og.GuestState <>2
string logContent = ""; string logContent = "";
string logTitle = ""; string logTitle = "";
int createBy = 0; int createBy = 0;
if (model.CreateType == Common.Enum.User.StuCreateTypeEnum.CustomerInput || model.CreateType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput) if (model.CreateType == Common.Enum.User.StuCreateTypeEnum.EmployeeInput)
{ {
model.StuSourceId = 0; model.StuSourceId = 0;
} }
model.StuTel = Common.Plugin.StringHelper.ReplaceMobile(model.StuRealMobile); model.StuTel = Common.Plugin.StringHelper.ReplaceMobile(model.StuRealMobile);
if (model.StuId > 0) if (model.StuId > 0)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment