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

check bugs

Browse Source
This commit is contained in:
yubaolee
2018-04-10 10:53:48 +08:00
parent b7e1dca8e2
commit 4b88345c12
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenAuth.App/FlowInstanceApp.cs
View File

@@ -16,6 +16,7 @@ namespace OpenAuth.App
/// </summary>
public class FlowInstanceApp : BaseApp<FlowInstance>
{
public RevelanceManagerApp RevelanceManagerApp { get; set; }
#region 流程处理API
/// <summary>
@@ -398,9 +399,10 @@ namespace OpenAuth.App
makerList = "-1";
}
}
else if (node.setInfo.NodeDesignate == Setinfo.SPECIAL_ROLE)
else if (node.setInfo.NodeDesignate == Setinfo.SPECIAL_ROLE) //指定角色
{
makerList = GenericHelpers.ArrayToString(node.setInfo.NodeDesignateData.roles, makerList);
var users = RevelanceManagerApp.Get(Define.USERROLE, false, node.setInfo.NodeDesignateData.roles);
makerList = GenericHelpers.ArrayToString(users, makerList);
if (makerList == "")
{

5
OpenAuth.Mvc/userJs/roles.js
View File

@@ -6,6 +6,7 @@ layui.config({
$ = layui.jquery;
var table = layui.table;
var openauth = layui.openauth;
var toplayer = (top == undefined || top.layer === undefined) ? layer : top.layer; //顶层的LAYER
layui.droptree("/UserSession/GetOrgs", "#Organizations", "#OrganizationIds");
$("#menus").loadMenus("Role");
@@ -159,9 +160,9 @@ layui.config({
}
var index = layer.open({
title: "为用角色配模块",
title: "为角色【" + data[0].Name + "】分配模块",
type: 2,
area: ['450px', '400px'],
area: ['750px', '600px'],
content: "/ModuleManager/Assign?type=RoleModule&menuType=RoleElement&id=" + data[0].Id,
success: function (layero, index) {