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_OP_ALLUSER>(t => t.CODE == user.CODE, new string[] { "ID,CODE,ORG_ID,TENANT" });
+                        var tennant = context.GetEntity<T_OP_TENANT>(t => t.ID == orgIDGUID, new string[] { "CODE" }).CODE;
+                        var allUser = context.GetEntity<T_OP_ALLUSER>(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;