diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs index 6187f83..ab659a5 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs @@ -78,8 +78,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO var currFMUser = GetEntity((Guid)userID, "Nav_Person.Nav_Post", "Nav_Department.Nav_Parent"); if (currFMUser != null) { - var team = GetEntity(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID); - + var team = GetEntity(t => t.DEPARTMENT_ID == currFMUser.DEPARTMENT_ID); + var depart = GetEntity(t => t.ID == currFMUser.DEPARTMENT_ID); if (entity.CLASS_TEAM_ID == Guid.Empty || entity.CLASS_TEAM_ID == null) { if (team != null) @@ -94,7 +94,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO if (entity.NAME == null) { isManual = true; - entity.NAME = DateTime.Now.ToShortDateString() + team.NAME + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录"; + entity.NAME = DateTime.Now.ToShortDateString() + (team!=null?team?.NAME:depart?.NAME) + "-" + currFMUser.Nav_Person.Nav_Post.NAME + "当班工作记录"; entity.RECORD_DATE = DateTime.Now; } if (entity.CHARGE_USER_ID == null || entity.CHARGE_USER_ID == Guid.Empty)