2222

RMYY_CallCenter_Api/Controllers/System/MenuController.cs

@@ -18,8 +18,8 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// <returns></returns>
         public ActionResult GetList()
         {
-            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 ");
+            List<Model.T_Sys_Menu> list =menuBLL.GetModelList("(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 )");
             foreach (var item in list)
             {
                 if (item.F_Type == 2)

RMYY_CallCenter_Api/Controllers/System/RoleController.cs

@@ -18,7 +18,6 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// 获取分页列表
         /// </summary>
         /// <returns></returns>
-        [HttpPost]
         public ActionResult GetList()
         {
             DataTable dt = new DataTable();
@@ -215,9 +214,13 @@ namespace RMYY_CallCenter_Api.Controllers.System
         /// </summary>
         /// <param name="roleid"></param>
         /// <returns></returns>
-        public ActionResult GetRoleFunction(int roleid)
+        public ActionResult GetRoleFunction(int roleid=0)
         {
             var moduleFList = new Bll.T_Sys_Menu().GetModelList(" F_State=1 ");
+            if (roleid == 0)
+            {
+                return Error("参数错误！");
+            }
             var list = DB.DbHelperSQL.Query("select F_MenuId from T_Sys_RoleMenu with(nolock) where F_RoleId=" + roleid).Tables[0];
 
             return Success("加载成功", moduleFList.Select(x => new