Merge branch 'master' of http://192.168.1.222:3000/zhoufan/RMYY_CallCenter_Api

RMYY_CallCenter_Api/Common/Common.cs

             }
             else
             {
-                var dt = DB.DbHelperSQL.Query("select a.F_MenuId as F_MenuId from T_Sys_RoleMenu as a join T_Sys_Menu as b on b.F_MenuId = a.F_MenuId where b.F_Type = 3 and b.F_State = 1 and F_RoleId = 1").Tables[0];
+                var dt = DB.DbHelperSQL.Query("select a.F_MenuId as F_MenuId from T_Sys_RoleMenu as a join T_Sys_Menu as b on b.F_MenuId = a.F_MenuId where b.F_Type = 3 and b.F_State = 1 and F_RoleId = '"+roleId+"'").Tables[0];
                 var actions1 = (from DataRow dr in dt.Rows select dr["F_MenuId"].ToString().ToLower()).ToList();
-                CacheHelper.Insert("RoleButtons_" + roleId, actions1);
+               CacheHelper.Insert("RoleButtons_" + roleId, actions1);
                 return actions1;
             }
         }