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);