From 78c3482c73ed870d9c70a4c428a2dfe0e1ae002d Mon Sep 17 00:00:00 2001
From: sunnian <853128958@qq.com>
Date: Wed, 2 Nov 2016 17:00:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=A0=B9=E6=8D=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7id=E6=9F=A5=E8=AF=A2=E8=8F=9C=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Web.config                   |  1 +
 Bootstrap.DataAccess/MenuHelper.cs           | 33 ++++++++++++++++++--
 Bootstrap.DataAccessTests/MenuHelperTests.cs |  6 ++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/Bootstrap.Admin/Web.config b/Bootstrap.Admin/Web.config
index e76ad73b..bf3a62a5 100644
--- a/Bootstrap.Admin/Web.config
+++ b/Bootstrap.Admin/Web.config
@@ -33,6 +33,7 @@
     <add key="RoleData-CodeRoleHelper-" interval="600" desc="角色信息缓存" />
     <add key="RoleData-CodeRoleHelper-Navigation-" interval="600" desc="菜单角色信息缓存"/>
     <add key="MenuData-CodeMenuHelper" interval="600" desc="菜单信息缓存" />
+    <add key="MneuData-CodeMenuHelper-User" interval="600" desc="用户菜单信息缓存"/>
     <add key="LogData-CodeMenuHelper" interval="600" desc="日志信息缓存" />
     <add key="DictData-CodeDictHelper" interval="600" desc="字典信息缓存" />
     <add key="UserData-CodeUserHelper-Group-" interval="600" desc="用户信息缓存" />
diff --git a/Bootstrap.DataAccess/MenuHelper.cs b/Bootstrap.DataAccess/MenuHelper.cs
index c102bdd6..9720c293 100644
--- a/Bootstrap.DataAccess/MenuHelper.cs
+++ b/Bootstrap.DataAccess/MenuHelper.cs
@@ -15,6 +15,7 @@ namespace Bootstrap.DataAccess
     public static class MenuHelper
     {
         private const string MenuDataKey = "MenuData-CodeMenuHelper";
+        private const string MenuByUserDataKey = "MneuData-CodeMenuHelper-User";
         /// <summary>
         /// 查询所有菜单信息
         /// </summary>
@@ -52,14 +53,40 @@ namespace Bootstrap.DataAccess
             return string.IsNullOrEmpty(tId) ? ret : ret.Where(t => tId.Equals(t.ID.ToString(), StringComparison.OrdinalIgnoreCase));
         }
         /// <summary>
-        /// 
+        /// 查询某个用户所配置的菜单
         /// </summary>
         /// <param name="userId"></param>
         /// <returns></returns>
         public static IEnumerable<Menu> RetrieveMenusByUserId(int userId)
         {
-            //UNDONE: 通过用户ID获得到当前用户配置的菜单
-            return RetrieveMenus();
+            string sql = "select distinct n.* from UserRole ur,NavigationRole nr,Navigations n where ur.RoleID=nr.RoleID and nr.NavigationID=n.ID and ur.UserID = @UserID";
+            return CacheManager.GetOrAdd(MenuByUserDataKey, CacheSection.RetrieveIntervalByKey(MenuByUserDataKey), key =>
+            {
+                List<Menu> Menus = new List<Menu>();
+                DbCommand cmd = DBAccessManager.SqlDBAccess.CreateCommand(CommandType.Text, sql);
+                try
+                {
+                    cmd.Parameters.Add(DBAccessManager.SqlDBAccess.CreateParameter("@UserID", userId, ParameterDirection.Input));
+                    using (DbDataReader reader = DBAccessManager.SqlDBAccess.ExecuteReader(cmd))
+                    {
+                        while (reader.Read())
+                        {
+                            Menus.Add(new Menu()
+                            {
+                                ID = (int)reader[0],
+                                ParentId = (int)reader[1],
+                                Name = (string)reader[2],
+                                Order = (int)reader[3],
+                                Icon = LgbConvert.ReadValue(reader[4], string.Empty),
+                                Url = LgbConvert.ReadValue(reader[5], string.Empty),
+                                Category = (string)reader[6]
+                            });
+                        }
+                    }
+                }
+                catch (Exception ex) { ExceptionManager.Publish(ex); }
+                return Menus;
+            }, CacheSection.RetrieveDescByKey(MenuByUserDataKey));
         }
         /// <summary>
         /// 删除菜单信息
diff --git a/Bootstrap.DataAccessTests/MenuHelperTests.cs b/Bootstrap.DataAccessTests/MenuHelperTests.cs
index 7222d40e..308ae0df 100644
--- a/Bootstrap.DataAccessTests/MenuHelperTests.cs
+++ b/Bootstrap.DataAccessTests/MenuHelperTests.cs
@@ -32,6 +32,12 @@ namespace Bootstrap.DataAccess.Tests
             Assert.IsTrue(MenuHelper.RetrieveMenus().Count() > 1, "不带参数的MenuHelper.RetrieveMenus方法调用失败");
         }
 
+        [TestMethod]
+        public void RetrieveMenuByUserIDTest() 
+        {
+            Assert.IsTrue(MenuHelper.RetrieveMenusByUserId(1).Count() > 1, "根据用户ID查询菜单的MenuHelper.RetrieveMenusByUserId方法调用失败");
+        }
+
         [TestMethod]
         public void SaveMenuTest()
         {