From 539bf6ce173591333953525c88fa95dcd8b95fbb 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: Wed, 13 May 2026 11:17:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs | 5 +++-- .../Controllers/Api/HiddenDangerHandReportController.cs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs index 9aff648..7a8c86e 100644 --- a/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs +++ b/APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs @@ -1579,10 +1579,11 @@ namespace APT.FM.WebApi.Controllers.Api.FM var orgIDGUID = new Guid(filter.Parameter1); using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"])) { - var allUser = context.GetEntity(t => t.CODE == user.CODE, new string[] { "ID,CODE,ORG_ID,TENANT" }); + var tennant = context.GetEntity(t => t.ID == orgIDGUID, new string[] { "CODE" }).CODE; + var allUser = context.GetEntity(t => t.CODE == user.CODE, new string[] { "ID", "CODE", "ORG_ID", "TENANT", "PHONE" }); if (allUser != null) { - allUser.TENANT = filter.Parameter1.Substring(0,3); + allUser.TENANT = tennant; allUser.ORG_ID = orgIDGUID; context.UpdateEntity(allUser); context.SaveChanges(); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs index 3a84749..0f24eb1 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs @@ -105,7 +105,7 @@ namespace APT.SK.WebApi.Controllers.Api confirm.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)userName?.Nav_Department?.DEPARTMENT_TYPE; if (files != null && files.Any()) { - foreach (var file in files) + foreach (var file in files.Where(t=>t.IS_DELETED == false).ToList()) { T_SK_HIDDEN_DANGER_CONFIRM_PHOTO photo = new T_SK_HIDDEN_DANGER_CONFIRM_PHOTO(); photo.ORG_ID = file.ORG_ID;