From 5ddf7f420618d803521d3903e9bec04bb5aca38e 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: Fri, 24 Apr 2026 14:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChangeShiftRecordController.cs | 45 +++------- .../CrucialLicenseJobController.cs | 9 +- .../CrucialLicenseJobOutsourceController.cs | 5 +- .../Controllers/CurrentClassRecord.cs | 56 +++++------- .../JobActivityRecordController.cs | 9 +- .../Controllers/JobEventRecordController.cs | 13 +-- .../PreShiftMeetingRecordController.cs | 90 ++++++++----------- .../Controllers/TeamActivityController.cs | 32 ++----- .../TechDisclosureFromController.cs | 9 +- .../Api/HiddenDangerHandReportController.cs | 2 +- 10 files changed, 104 insertions(+), 166 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs index 04838c3..e40e763 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs @@ -221,35 +221,30 @@ namespace APT.FO.WebApi.Controllers.Api.FO /// /// 分页过滤实体 /// - [HttpPost, Route("OrderPaged")] + [HttpPost, Route("OrderPaged")] public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter) { var result = new PagedActionResult(); + var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var users = this.GetEntities(t => t.ENABLE_STATUS == 0,new BaseFilter(pageFilter.OrgId), "Nav_ApproveRole"); - var admiId = users.FirstOrDefault(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; - var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; - var tempDeps = GetEntities(t=>t.ENABLE_STATUS == 0,new BaseFilter(pageFilter.OrgId)); - var tempDep = tempDeps.FirstOrDefault(t=>t.ID == currDep); + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; pageFilter.IgnoreDataRule = true; pageFilter.Include.Add("Nav_PreUsers"); pageFilter.Include.Add("Nav_AfterUsers"); pageFilter.Include.Add("Nav_Team"); pageFilter.Limit = 10; - if (tempDep!=null&& tempDep.DEPARTMENT_TYPE == (int)FMDepartmentType.Class) - { - currDep = (Guid)tempDep.PARENT_ID; - } - var AHDepartment = users.FirstOrDefault(t => t.Nav_ApproveRole != null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; - if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) + var users = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_ApproveRole"); + var tempDeps = GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)); + var departStatus = tempDeps.FirstOrDefault(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } - else if (tempDep != null && (tempDep.NAME.Contains("安环科") || tempDep.NAME.Contains("安全环保")) && tempDep.PARENT_ID != null) + else { - List departmentId = new List(); - departmentId.Add((Guid)tempDep.PARENT_ID); - List departmentIds = new List() { (Guid)tempDep.PARENT_ID }; + List departmentId = new List() { loginDepartmentId.Value }; + List departmentIds = new List() { loginDepartmentId.Value }; DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); if (departmentIds != null && departmentIds.Any()) { @@ -258,20 +253,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO else result.Data = null; } - else - { - var loginDepartmentId = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - List departmentId = new List(); - departmentId.Add((Guid)loginDepartmentId); - List departmentIds = new List() { (Guid)loginDepartmentId }; - DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); - if (departmentIds != null && departmentIds.Any()) - { - result = this.GetOrderPageEntities(t => t.Nav_Team!=null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID), pageFilter); - } - else - result.Data = null; - } if (result.Data.Any()) { foreach (var entity in result.Data) @@ -279,12 +260,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO if (entity.Nav_PreUsers != null && entity.Nav_PreUsers.Any()) { var userTemp = entity.Nav_PreUsers.Select(t => t.USER_ID).ToList(); - var userList = users.Where(t => userTemp.Contains(t.ID)).Select(m=>m.NAME).ToList(); + var userList = users.Where(t => userTemp.Contains(t.ID)).Select(m => m.NAME).ToList(); entity.CURRENT_USER = string.Join(",", userList); } if (entity.Nav_AfterUsers != null && entity.Nav_AfterUsers.Any()) { - var user = users.FirstOrDefault(t=>t.ID == entity.Nav_AfterUsers.FirstOrDefault().USER_ID); + var user = users.FirstOrDefault(t => t.ID == entity.Nav_AfterUsers.FirstOrDefault().USER_ID); if (user != null) { entity.CHANGE_DEPART = tempDeps.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID)?.NAME; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index d59dcde..9cfa7e9 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -1757,10 +1757,11 @@ namespace APT.FO.WebApi.Controllers pageFilter.FilterGroup.Rules.Remove(filter); var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; - //安环部负责人departmentID - var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + //安环部负责人departmentID + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs index 68c3bbc..5c50e31 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -1064,8 +1064,9 @@ namespace APT.FO.WebApi.Controllers var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; //安环部负责人departmentID - var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs index bf77a73..d1f09cd 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs @@ -612,46 +612,32 @@ namespace APT.FO.WebApi.Controllers.Api.FO /// /// 分页过滤实体 /// - [HttpPost, Route("OrderPaged")] + [HttpPost, Route("OrderPaged")] public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter) - { - pageFilter.IgnoreDataRule = true; + { + pageFilter.IgnoreDataRule = true; pageFilter.Include.Add("Nav_Team"); var result = new PagedActionResult(); - var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var admiId = this.GetEntity(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; - var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; - var AHDepartment = GetEntity(t => t.Nav_ApproveRole!=null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; - var departInfo = GetEntity(t => t.ID == currDep && t.ENABLE_STATUS == 0); - if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) - { - result = this.GetOrderPageEntities(null, pageFilter); - } - else if (departInfo != null && (departInfo.NAME.Contains("安环科") || departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID != null) - { - List departmentId = new List(); - departmentId.Add((Guid)departInfo.PARENT_ID); - List departmentIds = new List() { (Guid)departInfo.PARENT_ID }; - DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); - if (departmentIds != null && departmentIds.Any()) - { - result = this.GetOrderPageEntities(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID) - } - else - result.Data = null; + var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; + var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + //安环部负责人departmentID + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) + { + result = this.GetOrderPageEntities(null, pageFilter); } else - { - var loginDepartmentId = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - List departmentId = new List(); - departmentId.Add((Guid)loginDepartmentId); - List departmentIds = new List() { (Guid)loginDepartmentId }; - DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); - if (departmentIds != null && departmentIds.Any()) - { - result = this.GetOrderPageEntities(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID) - } - else + { + List departmentId = new List() { loginDepartmentId.Value }; + List departmentIds = new List() { loginDepartmentId.Value }; + DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); + if (departmentIds != null && departmentIds.Any()) + { + result = this.GetOrderPageEntities(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID) + } + else result.Data = null; } return result; diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs index c0efe39..70925fe 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs @@ -791,10 +791,11 @@ namespace APT.FO.WebApi.Controllers pageFilter.FilterGroup.Rules.Remove(filter); var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; - //安环部负责人departmentID - var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + //安环部负责人departmentID + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs index b85e24e..051e8ed 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs @@ -750,12 +750,13 @@ namespace APT.FO.WebApi.Controllers var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PARENT_NAME"); if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString())) pageFilter.FilterGroup.Rules.Remove(filter); - var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; - var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; - //安环部负责人departmentID - var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) + var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; + var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + //安环部负责人departmentID + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User"); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index 36ac8c5..a82a848 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -780,61 +780,41 @@ namespace APT.FO.WebApi.Controllers.Api.FO /// 分页过滤实体 /// [HttpPost, Route("OrderPaged")] - public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter) - { - pageFilter.IgnoreDataRule = true; - pageFilter.Include.Add("Nav_Team"); - pageFilter.Include.Add("Nav_Users.Nav_User"); - var result = new PagedActionResult(); - var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var admiId = this.GetEntity(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; - var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; - var AH = GetEntity(t => t.Nav_ApproveRole != null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")); - Guid? AHDepartment = Guid.Empty; - var departInfo = GetEntity(t => t.ID == currDep && t.ENABLE_STATUS == 0); - Expression> express = t => t.IS_DELETED==false; - if (!string.IsNullOrEmpty(pageFilter.Parameter1)) - { - express = express.And(t => t.Nav_Users.Any(i =>i.Nav_User!=null && i.Nav_User.NAME.Contains(pageFilter.Parameter1))); - } - if (AH != null) - { - AHDepartment = AH.DEPARTMENT_ID; - } - if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) - { - result = this.GetOrderPageEntities(express, pageFilter); - } - else if (departInfo!=null && (departInfo.NAME.Contains("安环科")|| departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID!=null) - { - List departmentId = new List(); - departmentId.Add((Guid)departInfo.PARENT_ID); - List departmentIds = new List() { (Guid)departInfo.PARENT_ID }; - DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); - if (departmentIds != null && departmentIds.Any()) - { - express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)); - result = this.GetOrderPageEntities(express, pageFilter);//|| dataIds.Contains(t.ID) - } - else - result.Data = null; - } - else - { - var loginDepartmentId = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - List departmentId = new List(); - departmentId.Add((Guid)loginDepartmentId); - List departmentIds = new List() { (Guid)loginDepartmentId }; - DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); - if (departmentIds != null && departmentIds.Any()) - { - express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)); - result = this.GetOrderPageEntities(express, pageFilter);//|| dataIds.Contains(t.ID) - } - else - result.Data = null; - } - return result; + public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter) + { + pageFilter.IgnoreDataRule = true; + pageFilter.Include.Add("Nav_Team"); + pageFilter.Include.Add("Nav_Users.Nav_User"); + var result = new PagedActionResult(); + Expression> express = t => t.IS_DELETED == false; + if (!string.IsNullOrEmpty(pageFilter.Parameter1)) + { + express = express.And(t => t.Nav_Users.Any(i => i.Nav_User != null && i.Nav_User.NAME.Contains(pageFilter.Parameter1))); + } + var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; + var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + //安环部负责人departmentID + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) + { + result = this.GetOrderPageEntities(express, pageFilter); + } + else + { + List departmentId = new List() { loginDepartmentId.Value }; + List departmentIds = new List() { loginDepartmentId.Value }; + DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); + if (departmentIds != null && departmentIds.Any()) + { + express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)); + result = this.GetOrderPageEntities(express, pageFilter);//|| dataIds.Contains(t.ID) + } + else + result.Data = null; + } + return result; } } } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs index d02246d..bf05170 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs @@ -257,20 +257,20 @@ namespace APT.FO.WebApi.Controllers.Api.FO pageFilter.IgnoreDataRule = true; pageFilter.Include.Add("Nav_Taem"); var result = new PagedActionResult(); + var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var admiId = this.GetEntity(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; - var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; - var AHDepartment = GetEntity(t => t.Nav_ApproveRole!=null &&(t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; - var departInfo = GetEntity(t => t.ID == currDep && t.ENABLE_STATUS == 0); - if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + //安环部负责人departmentID + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } - else if (departInfo != null && (departInfo.NAME.Contains("安环科") || departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID != null) + else { - List departmentId = new List(); - departmentId.Add((Guid)departInfo.PARENT_ID); - List departmentIds = new List() { (Guid)departInfo.PARENT_ID }; + List departmentId = new List() { loginDepartmentId.Value }; + List departmentIds = new List() { loginDepartmentId.Value }; DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); if (departmentIds != null && departmentIds.Any()) { @@ -279,20 +279,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO else result.Data = null; } - else - { - var loginDepartmentId = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - List departmentId = new List(); - departmentId.Add((Guid)loginDepartmentId); - List departmentIds = new List() { (Guid)loginDepartmentId }; - DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); - if (departmentIds != null && departmentIds.Any()) - { - result = this.GetOrderPageEntities(t => t.Nav_Taem!=null && departmentIds.Contains((Guid)t.Nav_Taem.DEPARTMENT_ID), pageFilter);//|| dataIds.Contains(t.ID) - } - else - result.Data = null; - } return result; } } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs index bb73edb..053e9e7 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs @@ -786,10 +786,11 @@ namespace APT.FO.WebApi.Controllers var result = new PagedActionResult(); var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; - //安环部负责人departmentID - var manageDepartId = this.GetEntity(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; - if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) + var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + //安环部负责人departmentID + var departStatus = this.GetEntity(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS; + var ahRole = this.GetEntity(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId); + if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs index d3c1f5d..3a84749 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs @@ -115,7 +115,7 @@ namespace APT.SK.WebApi.Controllers.Api } } //发消息 - var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'); + var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0')+")"; if (orgId.ToString() == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913") { titleName = "手动隐患上报完善";