From 100dc5f5f83e6161d882bcb426b833978be797b7 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Fri, 10 Apr 2026 14:37:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=9F=B9=E8=AE=AD=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E8=A7=A6=E5=8F=91=20=E6=8E=A5=E6=94=B6=E8=A7=92?= =?UTF-8?q?=E8=89=B2=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.PP.WebApi/Controllers/Api/SEController.cs | 11 ++++++++++- .../Api/SEController/SEConfigController.cs | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs index b4c3f80..7c5dc3f 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs @@ -1495,7 +1495,16 @@ namespace APT.PP.WebApi.Controllers.Api.PP { return true; } - T_FM_USER user = UserService.GetSafeApproveUser(config.ORG_ID.Value);//默认安环专员 + T_FM_USER user = null; + if (config.APPROVAL_ROLE_ID.HasValue) + { + //走配置 + user = GetEntity(e => e.APPROVE_ROLE_ID.HasValue && e.APPROVE_ROLE_ID.Value == config.APPROVAL_ROLE_ID.Value && e.ENABLE_STATUS == 0 && !e.IS_DELETED); + } + if (user == null) + { + user = UserService.GetSafeApproveUser(config.ORG_ID.Value);//默认安环专员 + } if (user == null) { throw new Exception("未找到安环部相关审批人员!"); diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SEConfigController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SEConfigController.cs index 9f286ff..4ef371e 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SEConfigController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SEConfigController.cs @@ -40,6 +40,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE { entity.ORG_ID = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId; } + entity.Nav_ApproveRole = null; this.UnifiedCommit(() => { UpdateEntityNoCommit(entity);