From 59d564d6d1e2e4fcd8de821949a43a483dc5523f 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 15:39:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=8E=B0BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/ChangeShiftRecordController.cs | 4 ++-- .../Controllers/CrucialLicenseJobController.cs | 6 +++--- .../CrucialLicenseJobOutsourceController.cs | 6 +++--- .../APT.FO.WebApi/Controllers/CurrentClassRecord.cs | 4 ++-- .../Controllers/JobActivityRecordController.cs | 4 ++-- .../Controllers/JobEventRecordController.cs | 4 ++-- .../APT.FO.WebApi/Controllers/PreOperSchController.cs | 10 ++++++---- .../Controllers/PreShiftMeetingRecordController.cs | 4 ++-- .../Controllers/TeamActivityController.cs | 6 +++--- .../Controllers/TechDisclosureFromController.cs | 4 ++-- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs index e40e763..7a77816 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs @@ -227,7 +227,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO 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; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; pageFilter.IgnoreDataRule = true; pageFilter.Include.Add("Nav_PreUsers"); pageFilter.Include.Add("Nav_AfterUsers"); @@ -237,7 +237,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO 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) + if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs index 9cfa7e9..1c90b4e 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs @@ -1756,12 +1756,12 @@ namespace APT.FO.WebApi.Controllers 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; + var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && 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 5c50e31..8201adf 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs @@ -1061,12 +1061,12 @@ namespace APT.FO.WebApi.Controllers 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; + var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && 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 d1f09cd..5b3898c 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs @@ -620,11 +620,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO 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; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs index 70925fe..560646d 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs @@ -791,11 +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; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && 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 051e8ed..f0d824a 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs @@ -752,11 +752,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; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && 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/PreOperSchController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs index 54aaf24..a48aa8f 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs @@ -9,6 +9,7 @@ using APT.MS.Domain.Entities.FO; using APT.MS.Domain.Enums; using APT.Utility; using Microsoft.AspNetCore.Mvc; +using StackExchange.Redis; using System; using System.Collections.Generic; using System.Linq; @@ -280,10 +281,11 @@ namespace APT.FM.WebApi.Controllers.Api.FO 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 = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; + //安环部负责人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 ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs index a82a848..8b2cd66 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs @@ -793,11 +793,11 @@ namespace APT.FO.WebApi.Controllers.Api.FO } var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; - var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(express, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs index bf05170..5de2f1a 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs @@ -258,12 +258,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO 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 loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; + var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); } diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs index 053e9e7..6170d86 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs @@ -786,11 +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; + var loginUserCode = this.GetEntity(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE; //安环部负责人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) + if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null) { result = this.GetOrderPageEntities(null, pageFilter); }