From 8d3e4a3aae842716a47375924771720120dcd92a Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Sun, 27 Sep 2020 09:24:09 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=9A=85=E5=85=AC=E6=96=87=E6=8E=A5?= =?UTF-8?q?=E6=94=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NodeMethod/Sys_ReceiveDocumentMethod.cs | 2 +- .../NodeMethod/Sys_SendFileMethod.cs | 2 +- Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_ReceiveDocumentMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_ReceiveDocumentMethod.cs index 6d9cbeab0..6b38c1f2a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_ReceiveDocumentMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_ReceiveDocumentMethod.cs @@ -21,7 +21,7 @@ namespace Learun.Application.WorkFlow //审批同意的话需要 获取校长审批意见 var list = nWFTaskIBLL.GetLogList(parameter.processId); - var logEntity = list.FirstOrDefault(a => a.F_TaskUserName == "超级管理员"); + var logEntity = list.FirstOrDefault(a => a.F_TaskUserName == "超级管理员" || a.F_TaskUserName=="关亮"); var entity = asset.GetEntityByProcessId(parameter.processId); if (null != entity && null != logEntity) { diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs index 0ba08416c..8dbc4f560 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WorkFlow/NodeMethod/Sys_SendFileMethod.cs @@ -27,7 +27,7 @@ namespace Learun.Application.WorkFlow { asset.ChangeStatusByProcessId(parameter.processId, 2); var list = nWFTaskIBLL.GetLogList(parameter.processId); - var nwfTaskLogEntity = list.FirstOrDefault(a => a.F_TaskUserName == "关亮"); + var nwfTaskLogEntity = list.FirstOrDefault(a => a.F_TaskUserName == "关亮" || a.F_TaskUserName=="超级管理员"); Sys_SendFileEntity entity = asset.GetEntityByProcessId(parameter.processId); if (nwfTaskLogEntity != null) { diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index 42a2982e3..1d194df27 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -7,7 +7,7 @@ export default { "enableSignUp": true, // 请求数据的接口地址;可以配置多个,开发环境下登录页会出现选择菜单供您选择 "apiHost": [ - "https://oa.bjquanjiang.com/learun/adms" + "https://wx.qjkjedu.com/learun/adms" ], // "apiHost": [ // "http://192.168.2.94:31173/learun/adms"