diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index 4365320..5b561af 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -5551,6 +5551,7 @@ namespace APT.PP.WebApi.Controllers.Api enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL; enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; enterpriseLib.NUM = entity.NUM; + enterpriseLib.EMERGENCY = entity.EMERGENCY; libs.Add(enterpriseLib); var measureTemps = libraryDetails.Where(t=>t.BASIC_LIBRARY_ID == entity.ID).ToList(); if (measureTemps.Any()) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs index fa47517..34d2ac5 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckContentsController.cs @@ -55,7 +55,7 @@ namespace APT.SK.WebApi.Controllers.Api { return SafeExecute(() => { - var olds = this.GetEntity(t => !t.IS_DELETED && t.CHECKCONTENT == entity.CHECKCONTENT && t.ID != entity.ID); + var olds = this.GetEntity(t => !t.IS_DELETED && t.CHECKCONTENT == entity.CHECKCONTENT && t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID); if (olds != null) { throw new Exception("检查内容重复,请先修改"); diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index cc6665a..2522d2b 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -513,6 +513,7 @@ namespace APT.SK.WebApi.Controllers.Api enterpriseLib.EVALUATE_LEVEL = entity.EVALUATE_LEVEL; enterpriseLib.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE; enterpriseLib.NUM = entity.NUM; + enterpriseLib.EMERGENCY = entity.EMERGENCY; if (details != null && details.Any()) { foreach (var item in details) @@ -1813,7 +1814,7 @@ namespace APT.SK.WebApi.Controllers.Api DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List() { loginDepart.Value }, ref departmentIds); var checkList = new JsonActionResult>(); List postLists = new List(); - var detailContents = this.GetEntities(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_Library", "Nav_PostDetails", "Nav_Department"); + var detailContents = this.GetEntities(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_Library.Nav_ProductionUnit", "Nav_PostDetails", "Nav_Department"); if (detailContents != null && detailContents.Any()) { foreach (var item in detailContents) @@ -1826,7 +1827,8 @@ namespace APT.SK.WebApi.Controllers.Api T_SK_ENTERPRISE_LIBRARY_POST part = new T_SK_ENTERPRISE_LIBRARY_POST(); part.DEPARTMENT_ID = item.DEPARTMENT_ID; part.ORG_ID = item.ORG_ID; - part.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + part.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID; + part.Nav_Library = item.Nav_Library; part.Nav_Department = item.Nav_Department; part.POST_NAME = posts.FirstOrDefault(t => t.ID == item2.POST_ID)?.NAME; part.PHONE = user?.NAME + " " + user?.PHONE; @@ -1838,7 +1840,7 @@ namespace APT.SK.WebApi.Controllers.Api if (checkList.Data != null && checkList.Data.Any()) { var libraryIds = postLists.Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList(); - var librarys = this.GetEntities(t => libraryIds.Contains(t.ID), new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_Details"); + var librarys = this.GetEntities(t => libraryIds.Contains(t.ID), new BaseFilter(filter.OrgId), "Nav_Area", "Nav_Type", "Nav_RiskName", "Nav_Details", "Nav_ProductionUnit"); foreach (var item in checkList.Data) { var tempIds = postLists.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.POST_NAME == item.POST_NAME).Select(m => m.ENTERPRISE_LIBRARY_ID).Distinct().ToList();