From 91dfa83e6fbee0cf6f4d114a468c5a2a2f8d2462 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Tue, 28 Feb 2017 16:51:07 +0800
Subject: [PATCH] check bugs

---
 .../Controllers/FlowDesignController.cs       | 34 +----------
 .../Views/FlowDesign/FlowSchemeBuider.cshtml  |  2 +-
 .../Views/FlowDesign/PreviewIndex.cshtml      |  1 +
 OpenAuth.Mvc/BllScripts/clientData.js         | 19 ++++++
 .../Content/scripts/utils/flowlayout.js       | 26 +--------
 .../Controllers/UserManagerController.cs      | 58 ++++++++++++++++++-
 OpenAuth.Mvc/OpenAuth.Mvc.csproj              |  1 +
 7 files changed, 83 insertions(+), 58 deletions(-)
 create mode 100644 OpenAuth.Mvc/BllScripts/clientData.js

diff --git a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs
index ad687844..befbd2f1 100644
--- a/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs
+++ b/OpenAuth.Mvc/Areas/FlowManage/Controllers/FlowDesignController.cs
@@ -169,38 +169,6 @@ namespace OpenAuth.Mvc.Areas.FlowManage.Controllers
         }
         #endregion
 
-        #region 获取权限数据
-
-        /// <summary>
-        /// 用户列表树 
-        /// </summary>
-        /// <returns>返回树形Json</returns>
-        [HttpGet]
-        public ActionResult GetUserCheckTreeJson()
-        {
-            var data = userBLL.Load(Guid.Empty, 1, 10);
-            var treeList = new List<TreeEntity>();
-            string companyid = "";
-            string departmentid = "";
-            foreach (UserView item in data.rows)
-            {
-                TreeEntity tree = new TreeEntity();
-               
-                tree.id = item.Id.ToString();
-                tree.text = item.Name;
-                tree.value = item.Id.ToString();
-                tree.isexpand = true;
-                tree.complete = true;
-                tree.hasChildren = false;
-                tree.parentId = "0";
-                tree.showcheck = true;
-                tree.img = "fa fa-user";
-                tree.Attribute = "mytype";
-                tree.AttributeValue = "User";
-                treeList.Add(tree);
-            }
-            return Content(treeList.TreeToJson());
-        }
-        #endregion
+       
     }
 }
diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml
index d939aa6d..ad63ac52 100644
--- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml
+++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/FlowSchemeBuider.cshtml
@@ -135,7 +135,7 @@
     /*=========基本配置（end）====================================================================*/
     function GetTree(type) {
         $.SetForm({
-            url: "../../FlowManage/FlowDesign/Get" + type + "CheckTreeJson",
+            url: "/UserManager/Get" + type + "CheckTreeJson",
             success: function (data) {
                 AllAuthorizeCheckData[type] = $.arrayClone(data);
                 //var item = {
diff --git a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml
index 659d1c9b..cfc50aea 100644
--- a/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml
+++ b/OpenAuth.Mvc/Areas/FlowManage/Views/FlowDesign/PreviewIndex.cshtml
@@ -3,6 +3,7 @@
     Layout = "~/Views/Shared/_FlowForm.cshtml";
 }
 <link href="~/Content/styles/flow.css" rel="stylesheet" />
+<script src="~/BllScripts/clientData.js"></script>
 <script>
     var keyValue = request('keyValue');
     var schemeVersion = request('schemeVersion');
diff --git a/OpenAuth.Mvc/BllScripts/clientData.js b/OpenAuth.Mvc/BllScripts/clientData.js
new file mode 100644
index 00000000..9c5f651e
--- /dev/null
+++ b/OpenAuth.Mvc/BllScripts/clientData.js
@@ -0,0 +1,19 @@
+$(function() {
+    $.getclientdata();
+});
+
+var clientuserData = [];
+$.getclientdata = function () {
+    $.ajax({
+        url: "/UserManager/GetAccessedUsers",
+        type: "get",
+        dataType: "json",
+        async: false,
+        success: function (data) {
+            clientuserData = data;
+        },
+        error: function (XMLHttpRequest, textStatus, errorThrown) {
+            console.log("加载可访问的用户列表失败！");
+        }
+    });
+}
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Content/scripts/utils/flowlayout.js b/OpenAuth.Mvc/Content/scripts/utils/flowlayout.js
index a298529b..a1b8c44a 100644
--- a/OpenAuth.Mvc/Content/scripts/utils/flowlayout.js
+++ b/OpenAuth.Mvc/Content/scripts/utils/flowlayout.js
@@ -233,10 +233,10 @@ $.fn.flowdesign = function (options) {
             }
             if (item.setInfo != undefined && item.setInfo.Taged != undefined)
             {
-              //  var _one = top.clientuserData[item.setInfo.UserId];
+                var _one = clientuserData[item.setInfo.UserId];
                 var _row = '<div style="text-align:left">';
                 var tagname = { "-1": "不通过", "1": "通过", "0": "驳回" };
-                _row += "<p>处理人：" + ( item.setInfo.UserId )+"</p>";
+                _row += "<p>处理人：" + (_one == undefined ? item.setInfo.UserId : _one.RealName) + "</p>";
                 _row += "<p>结果：" + tagname[item.setInfo.Taged] + "</p>";
                 _row += "<p>处理时间：" + item.setInfo.TagedTime + "</p>";
                 _row += "<p>备注：" + item.setInfo.description + "</p></div>";
@@ -307,30 +307,10 @@ $.fn.flowdesign = function (options) {
                         }
                     }
 
-                    _rowstr = "";
-                    for (var i in item.setInfo.NodeDesignateData.post) {
-                        var _postitem = item.setInfo.NodeDesignateData.post[i];
-                        var _one = top.clientpostData[_postitem];
-                        _rowstr += ' <span class="label label-info">' + (_one == undefined ? _postitem : _one.FullName) + '</span>';
-                        if (i == item.setInfo.NodeDesignateData.post.length - 1) {
-                            _popoverhtml += '<li>岗位:' + _rowstr + '</li>';
-                        }
-                    }
-
-                    _rowstr = "";
-                    for (var i in item.setInfo.NodeDesignateData.usergroup) {
-                        var _postitem = item.setInfo.NodeDesignateData.usergroup[i];
-                        var _one = top.clientuserGroup[_postitem];
-                        _rowstr += ' <span class="label label-warning">' + (_one == undefined ? _postitem : _one.FullName) + '</span>';
-                        if (i == item.setInfo.NodeDesignateData.usergroup.length - 1) {
-                            _popoverhtml += '<li>用户组:' + _rowstr + '</li>';
-                        }
-                    }
-
                     _rowstr = "";
                     for (var i in item.setInfo.NodeDesignateData.user) {
                         var _postitem = item.setInfo.NodeDesignateData.user[i];
-                        var _one = top.clientuserData[_postitem];
+                        var _one = clientuserData[_postitem];
                         _rowstr += ' <span class="label label-danger">' + (_one == undefined ? _postitem : _one.RealName) + '</span>';
                         if (i == item.setInfo.NodeDesignateData.user.length - 1) {
                             _popoverhtml += '<li>用户:' + _rowstr + '</li>';
diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs
index 212b6f80..967d682c 100644
--- a/OpenAuth.Mvc/Controllers/UserManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs
@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Web.Mvc;
 using Infrastructure;
+using LeaRun.Util.WebControl;
 using OpenAuth.App;
 using OpenAuth.App.ViewModel;
+using OpenAuth.Domain;
 using OpenAuth.Mvc.Models;
 
 namespace OpenAuth.Mvc.Controllers
@@ -66,6 +69,59 @@ namespace OpenAuth.Mvc.Controllers
             return JsonHelper.Instance.Serialize(Result);
         }
 
-        
+        #region 获取权限数据
+
+        /// <summary>
+        /// 用户列表树 
+        /// </summary>
+        /// <returns>返回树形Json</returns>
+        [HttpGet]
+        public ActionResult GetUserCheckTreeJson()
+        {
+            var treeList = new List<TreeEntity>();
+            string companyid = "";
+            string departmentid = "";
+            foreach (UserView item in _app.Load(Guid.Empty, 1, 10).rows)
+            {
+                TreeEntity tree = new TreeEntity();
+
+                tree.id = item.Id.ToString();
+                tree.text = item.Name;
+                tree.value = item.Id.ToString();
+                tree.isexpand = true;
+                tree.complete = true;
+                tree.hasChildren = false;
+                tree.parentId = "0";
+                tree.showcheck = true;
+                tree.img = "fa fa-user";
+                tree.Attribute = "mytype";
+                tree.AttributeValue = "User";
+                treeList.Add(tree);
+            }
+            return Content(treeList.TreeToJson());
+        }
+
+        /// <summary>
+        /// 获取用户可访问的账号
+        /// <para>李玉宝于2017-02-28 15:12:19</para>
+        /// </summary>
+        public string GetAccessedUsers()
+        {
+            IEnumerable<UserView> users =  _app.Load(Guid.Empty, 1, 10).rows;
+            var result = new Dictionary<string , object>();
+            foreach (var user in users)
+            {
+                var item = new
+                {
+                    Account = user.Account,
+                    RealName = user.Name,
+
+                };
+                result.Add(user.Id.ToString(), item);
+            }
+
+            return JsonHelper.Instance.Serialize(result);
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
index b6e2c475..afa2998f 100644
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@@ -395,6 +395,7 @@
     <Content Include="Content\scripts\plugins\flow-ui\img\gooflow_icon.png" />
     <Content Include="Content\scripts\plugins\flow-ui\img\gooflow_icon2.png" />
     <Content Include="Content\scripts\plugins\flow-ui\img\gooflow_tip.png" />
+    <Content Include="BllScripts\clientData.js" />
     <Content Include="Content\scripts\zTree\css\awesomeStyle\awesome.css" />
     <Content Include="Content\scripts\zTree\css\awesomeStyle\img\loading.gif" />
     <Content Include="Content\scripts\zTree\css\demo.css" />