From 4b88345c126cb568604a0d219dba1bf659e4ea15 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Tue, 10 Apr 2018 10:53:48 +0800
Subject: [PATCH] check bugs

---
 OpenAuth.App/FlowInstanceApp.cs | 6 ++++--
 OpenAuth.Mvc/userJs/roles.js    | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/OpenAuth.App/FlowInstanceApp.cs b/OpenAuth.App/FlowInstanceApp.cs
index 94c58203..97e960de 100644
--- a/OpenAuth.App/FlowInstanceApp.cs
+++ b/OpenAuth.App/FlowInstanceApp.cs
@@ -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 == "")
                     {
diff --git a/OpenAuth.Mvc/userJs/roles.js b/OpenAuth.Mvc/userJs/roles.js
index 1a33d3e8..c2fe7247 100644
--- a/OpenAuth.Mvc/userJs/roles.js
+++ b/OpenAuth.Mvc/userJs/roles.js
@@ -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) {