1111

RMYY_CallCenter_Api/Common/Common.cs

             }
             else
             {
-                var dt = DB.DbHelperSQL.Query("select m.F_Action FROM T_Sys_RoleMenu rm with(nolock) left join T_Sys_Menu m with(nolock) on rm.F_MenuId=m.F_MenuId where m.F_State=1 and rm.RoleId=" + roleId + " and isnull(m.F_Action,'')!='' ").Tables[0];
+                var dt = DB.DbHelperSQL.Query("select m.F_Action FROM T_Sys_RoleMenu rm with(nolock) left join T_Sys_Menu m with(nolock) on rm.F_MenuId=m.F_MenuId where m.F_State=1 and rm.F_RoleId=" + roleId + " and isnull(m.F_Action,'')!='' ").Tables[0];
                 var actions1 = (from DataRow dr in dt.Rows select dr["F_Action"].ToString().ToLower()).ToList();
                 CacheHelper.Insert("RoleActions_" + roleId, actions1, 10);
                 return actions1;

RMYY_CallCenter_Api/Controllers/System/MenuController.cs

         /// <returns></returns>
         public ActionResult GetList()
         {
-            var list = menuBLL.GetList(" F_State=1 ").Tables[0];
-
-            return Success("", list);
+            List<Model.T_Sys_Menu> list =menuBLL.GetModelList(" F_State=1 and (F_Type=1 or F_Type=2) ");
+            List<Model.T_Sys_Menu> listitem = menuBLL.GetModelList(" F_ParentId in (select F_MenuId from T_Sys_Menu where F_Type=2 group by F_MenuId ) and F_State=1 ");
+            foreach (var item in list)
+            {
+                if (item.F_Type == 2)
+                {
+                     item.button=listitem.Where(p => p.F_ParentId == item.F_MenuId).ToList();
+                }
+            }
+            list.Sort((x, y) => x.F_Sort ?? 0 - y.F_Sort ?? 0);
+            return Success("成功", list);
         }
 
         /// <summary>
         [HttpGet]
         public ActionResult GetTreeList()
         {
-            var ds_ModuleInfo = menuBLL.GetAllList();//DataSet
-            List<Model.T_Sys_Menu> list_ModuleInfo = menuBLL.DataTableToList(ds_ModuleInfo.Tables[0]);
-            list_ModuleInfo.Sort((x, y) => x.F_Sort??0 - y.F_Sort??0);//排序
+            var ds_ModuleInfo = menuBLL.GetModelList("F_Type = 1 or F_Type = 2");
+            ds_ModuleInfo.Sort((x, y) => x.F_Sort??0 - y.F_Sort??0);//排序
             var treeList = new List<TreeModel>();
-            foreach (var item in list_ModuleInfo)
+            foreach (var item in ds_ModuleInfo)
             {
                 TreeModel treeModel = new TreeModel();
                 treeModel.id = item.F_MenuId.ToString();
             return Success("获取菜单树成功", treeList.TreeRecursion("0"));
         }
 
+        private List<Model.T_Sys_Menu> TreeRecursion(List<Model.T_Sys_Menu> data, string parentId = "0")
+        {
+            List<Model.T_Sys_Menu> newList = new List<Model.T_Sys_Menu>();
+            List<Model.T_Sys_Menu> item = data.FindAll(t => t.F_ParentId.ToString() == parentId);//data建议在调用此扩展方法前已经排序过
+            if (item.Count > 0)
+            {
+                foreach (Model.T_Sys_Menu entity in item)
+                {
+                    if (entity.F_Type == 2 || entity.F_Type==1)
+                    {
+                        newList.Add(entity);
+                    }
+                    
+                }
+            }
+
+            return newList;
+        }
+
         /// <summary>
         /// 获取信息
         /// </summary>
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Insert(int pid, string code, string name, int sort, int type, string url, string function,string icon)
+        public ActionResult Insert(int pid, string code, string name, int sort, int type, string url, string function,string icon,string remark, int state = 1)
         {
             if (menuBLL.Exists(code))
             {
                 dModel.F_Url = url;
                 dModel.F_Action = function;
                 dModel.F_Icon = icon;
-                dModel.F_State = 1;
+                dModel.F_State = state;
+                dModel.F_Remark = remark;
                 dModel.F_CreateTime = DateTime.Now;
                 dModel.F_CreateUser = User.F_UserCode;
 
         /// <param name="sort"></param>
         /// <returns></returns>
         [HttpPost]
-        public ActionResult Update(int id, int pid, string code, string name, int sort, int type, string url, string function, string icon)
+        public ActionResult Update(int id, int pid, string code, string name, int sort, int type, string url, string function, string icon,string remark,int state=1)
         {
             Model.T_Sys_Menu dModel = menuBLL.GetModel(id);
             if (dModel != null)
                     dModel.F_Url = url;
                     dModel.F_Action = function;
                     dModel.F_Icon = icon;
-                    dModel.F_State = 1;
+                    dModel.F_State = state;
+                    dModel.F_Remark = remark;
 
                     if (menuBLL.Update(dModel))
                     {