lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-04-05 17:38:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #IBLLAG 加签人员驳回失败

Browse Source
This commit is contained in:
wintel 2025-02-25 22:44:23 +08:00
parent 04a557b6e6
commit 1369b08f70
2 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenAuth.App/FlowInstance/FlowInstanceApp.cs
View File

@ -2,7 +2,7 @@
* @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com> * @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com>
* @Date: 2024-12-13 16:55:17 * @Date: 2024-12-13 16:55:17
* @Description: 工作流实例表操作 * @Description: 工作流实例表操作
* @LastEditTime: 2025-02-19 11:43:24 * @LastEditTime: 2025-02-25 22:42:53
* Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved. * Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved.
*/ */
@ -507,7 +507,15 @@ namespace OpenAuth.App
{ {
var user = _auth.GetCurrentUser().User; var user = _auth.GetCurrentUser().User;
FlowInstance flowInstance = Get(reqest.FlowInstanceId); FlowInstance flowInstance = Get(reqest.FlowInstanceId);
if (flowInstance.MakerList != "1" && !flowInstance.MakerList.Contains(user.Id))
var approvers = _flowApproverApp.GetApproverIds(new QueryApproverReq
{
FlowInstanceId = reqest.FlowInstanceId,
ActivityId = flowInstance.ActivityId
});
if (flowInstance.MakerList != "1" && !flowInstance.MakerList.Contains(user.Id) &&
!approvers.Contains(user.Id))
{ {
throw new Exception("当前用户没有驳回该节点权限"); throw new Exception("当前用户没有驳回该节点权限");
} }

43
OpenAuth.Mvc/wwwroot/userJs/main.js
View File

@ -1,32 +1,29 @@
/* /*
* @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com> * @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com>
* @Date: 2023-12-25 14:43:53 * @Date: 2023-12-25 14:43:53
* @LastEditTime: 2024-12-03 14:00:32 * @LastEditTime: 2025-02-25 19:46:11
* @Description: * @Description:
* Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved. * Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved.
*/ */
layui.config({ layui.config({
base : "/js/" base: "/js/"
}).use(['form','element','layer','jquery'],function(){ }).use(['form', 'element', 'layer', 'jquery'], function () {
var form = layui.form, var $ = layui.jquery;
layer = parent.layer === undefined ? layui.layer : parent.layer,
element = layui.element,
$ = layui.jquery;
$(".panel a").on("click",function(){ $(".panel a").on("click", function () {
window.parent.addTab($(this)); window.parent.addTab($(this));
}) })
//用户数 //用户数
$.getJSON("/UserManager/Load?limit=1&page=1", $.getJSON("/UserManager/Load?limit=1&page=1",
function(data){ function (data) {
$(".userAll span").text(data.count); $(".userAll span").text(data.count);
} }
) )
//机构 //机构
$.getJSON("/UserSession/GetOrgs", $.getJSON("/UserSession/GetOrgs",
function (data) { function (data) {
$(".orgs span").text(data.Result.length); $(".orgs span").text(data.Result.length);
} }
@ -60,13 +57,13 @@ layui.config({
} }
) )
//数字格式化 //数字格式化
$(".panel span").each(function(){ $(".panel span").each(function () {
$(this).html($(this).text()>9999 ? ($(this).text()/10000).toFixed(2) + "<em>万</em>" : $(this).text()); $(this).html($(this).text() > 9999 ? ($(this).text() / 10000).toFixed(2) + "<em>万</em>" : $(this).text());
}) })
//系统基本参数 //系统基本参数
$(".version").text("v6.5"); //当前版本 $(".version").text("v7.1"); //当前版本
$(".author").text("yubaolee"); //开发作者 $(".author").text("yubaolee"); //开发作者
$(".homePage").text("/Home/Index"); //网站首页 $(".homePage").text("/Home/Index"); //网站首页
$(".server").text("centos docker"); //服务器环境 $(".server").text("centos docker"); //服务器环境