From d2f8f6346060bb59a85cc964ae33b3ace9fd6a6e 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: Mon, 24 Nov 2025 12:29:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/EnterpriseLibraryController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs index 505bc22..56e9b5b 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs @@ -2538,7 +2538,7 @@ namespace APT.SK.WebApi.Controllers.Api var loginUser = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var departs = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)); List selectMinetype = new List(); - var users = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Person" ,"Nav_ProdutionUnit").ToList(); + var users = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(filter.OrgId), "Nav_Department", "Nav_Person" ,"Nav_ProdutionUnit").ToList(); var userInfoTemp = users.FirstOrDefault(t => t.ID == loginUser); if (userInfoTemp != null && userInfoTemp.Nav_ProdutionUnit != null && userInfoTemp.Nav_ProdutionUnit.Any()) { @@ -2704,7 +2704,7 @@ namespace APT.SK.WebApi.Controllers.Api } list.Add(listNew); } - if (userInfoTemp != null && userInfoTemp.NAME.Contains("管理员")) + if (userInfoTemp != null && userInfoTemp.Nav_Department!=null && (userInfoTemp.NAME.Contains("管理员") || userInfoTemp.Nav_Department.DEPARTMENT_STATUS == 2 || userInfoTemp.Nav_Department.DEPARTMENT_TYPE == 5)) { checkList.Data = list.OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList(); }