Commit c57dc571 authored by 黄奎's avatar 黄奎

页面修改

parent 8f27509b
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// This code was generated by a tool. // 此代码由工具生成。
// 运行时版本:4.0.30319.42000
// //
// Changes to this file may cause incorrect behavior and will be lost if // 对此文件的更改可能会导致不正确的行为,并且如果
// the code is regenerated. // 重新生成代码,这些更改将会丢失。
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
...@@ -133,11 +133,11 @@ namespace Edu.Module.Duty ...@@ -133,11 +133,11 @@ namespace Edu.Module.Duty
{ {
var dutyItem = dutyItemList?.Where(qitem => qitem.Shifts.Contains(subItem.Shift.ToString()) && qitem.Id == dItem.ItemId && qitem.ItemSchools.Contains(item.School_Id.ToString()))?.FirstOrDefault(); var dutyItem = dutyItemList?.Where(qitem => qitem.Shifts.Contains(subItem.Shift.ToString()) && qitem.Id == dItem.ItemId && qitem.ItemSchools.Contains(item.School_Id.ToString()))?.FirstOrDefault();
int isFinish = 0; int isFinish = 0;
if (dutyItem.ItemType == ItemTypeEnum.Choice) if (dutyItem!=null&&dutyItem.ItemType == ItemTypeEnum.Choice)
{ {
isFinish = dItem.WorkIsFinish; isFinish = dItem.WorkIsFinish;
} }
else if (dutyItem.ItemType == ItemTypeEnum.FillIn) else if (dutyItem!=null&&dutyItem.ItemType == ItemTypeEnum.FillIn)
{ {
if (!string.IsNullOrEmpty(dItem.WorkContent)) if (!string.IsNullOrEmpty(dItem.WorkContent))
{ {
......
...@@ -283,6 +283,7 @@ namespace Edu.WebApi.Controllers.Duty ...@@ -283,6 +283,7 @@ namespace Edu.WebApi.Controllers.Duty
{ {
UserId = DutyMan; UserId = DutyMan;
} }
UserId = 0;
var obj = dutyPlanModule.OnDutyModule(Id, Shift, UserId, isQueryWork:true); var obj = dutyPlanModule.OnDutyModule(Id, Shift, UserId, isQueryWork:true);
return ApiResult.Success(data: obj); return ApiResult.Success(data: obj);
} }
......
{ {
"ConnectionStrings": { "ConnectionStrings": {
"DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=reborn_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ", "DefaultConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_edu;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"DefaultConnectionPName": "MySql.Data.MySqlClient", "DefaultConnectionPName": "MySql.Data.MySqlClient",
"FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ", "FinanceConnection": "server=192.168.20.214;user id=reborn;password=Reborn@2018;database=test_reborn_finance;CharSet=utf8mb4; Convert Zero Datetime=true; ",
"FinanceConnectionPName": "MySql.Data.MySqlClient", "FinanceConnectionPName": "MySql.Data.MySqlClient",
......
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