更新

RMYY_CallCenter_Api.Model/T_Sys_Menu.cs

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+
 namespace RMYY_CallCenter_Api.Model
 {
     /// <summary>
@@ -127,6 +129,8 @@ namespace RMYY_CallCenter_Api.Model
             set { _f_createtime = value; }
             get { return _f_createtime; }
         }
+
+        public List<T_Sys_Menu> children { get; set; }
         #endregion Model
 
     }

RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -10,6 +10,7 @@ namespace RMYY_CallCenter_Api.Controllers
 {
     public class IndexController : BaseController
     {
+        private Bll.T_Sys_Menu menbll = new Bll.T_Sys_Menu();
         // GET: Index
         /// <summary>
         /// 获取当前用户
@@ -27,14 +28,14 @@ namespace RMYY_CallCenter_Api.Controllers
         /// <returns></returns>
         public ActionResult GetMenu()
         {
+            var dt = new DataTable();
             var Menus = CacheHelper.Get<DataTable>("RoleMenus_" + User.F_RoleId);
             if (Menus != null)
             {
-                return Success("成功", Menus);
+                dt = Menus;
             }
             else
             {
-                var dt = new DataTable();
                 if (User.F_UserCode == "8000")
                 {
                     dt = DB.DbHelperSQL.Query("select * FROM T_Sys_Menu m with(nolock) where F_State=1 ").Tables[0];
@@ -44,10 +45,29 @@ namespace RMYY_CallCenter_Api.Controllers
                     dt = DB.DbHelperSQL.Query("select m.* 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=" + User.F_RoleId + " and isnull(m.F_Action,'')!='' ").Tables[0];
                 }
 
-                CacheHelper.Insert("RoleMenus_" + User.F_RoleId, dt, 10);
+                CacheHelper.Insert("RoleMenus_" + User.F_RoleId, dt, 10);              
+              
+            }
+            List<Model.T_Sys_Menu> moduleInfoList = menbll.DataTableToList(dt);
+            moduleInfoList.Sort((x, y) => x.F_Sort ?? 0 - y.F_Sort ?? 0);
+            return Success("获取符合权限的菜单", TreeRecursion(moduleInfoList));
+        }
 
-                return Success("成功", dt);
+
+        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)
+                {
+                    entity.children = TreeRecursion(data, entity.F_MenuId.ToString());
+                    newList.Add(entity);
+                }
             }
+
+            return newList;
         }
 
         /// <summary>

RMYY_CallCenter_Api/Controllers/WorkOrder/T_Dev_WorkOrderController.cs

@@ -86,7 +86,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                         message = "成功",
                         rows = modellist.Select(p =>
                         new
-                        { Wostate = EnumHelper.GetEnumDescription2((EnumDevWorkOrderState)p.F_State),
+                        { Wostate = Enum.GetName(typeof(EnumDevWorkOrderState),p.F_State),
                           DevState= Enum.GetName(typeof(EnumDevState),p.F_DevOutState),
                           SitMan=p.F_ControlManName+'('+p.F_ControlManName+')',
                           modellist = p
@@ -175,8 +175,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                 return Error("请选择要查询的工单！");
             }
             var model = orderbll.GetModel(id);
-            EnumDevWorkOrderState wostate = (EnumDevWorkOrderState)model.F_State;
-           string wostateName = EnumHelper.GetEnumDescription2(wostate);
+           string wostateName = Enum.GetName(typeof(EnumDevWorkOrderState), model.F_State);
             var itemlist = itembll.GetModelList(sql);
             //List<Con_WorkOrderInput> Input = modeltoopi(list);
             if (model != null)
@@ -1014,7 +1013,7 @@ namespace RMYY_CallCenter_Api.Controllers.WorkOrder
                             return Error("设备信息不正确！");
                         int? givenum = optmodel.F_GiveNum;
                         if(num> givenum)
-                            return Error("入库库数量不能大于出库数量！");
+                            return Error("入库数量不能大于出库数量！");
                         optmodel.F_RemainderNum = optmodel.F_RemainderNum ?? 0 + num;
                         int? getnum = optmodel.F_RemainderNum;
                         //optmodel.F_DeviceCode = code;