From 2638d6650bbf5b9c916a611b2d66486fcf919408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Sat, 3 Jan 2026 22:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E7=8F=AD=E5=B7=A5=E4=BD=9C=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=9D=9E=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98=E5=8F=91?= =?UTF-8?q?=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.FO.WebApi/Controllers/CurrentClassRecord.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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)