diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs
index 5ba2940..753baf4 100644
--- a/SGGL/BLL/Common/CommonService.cs
+++ b/SGGL/BLL/Common/CommonService.cs
@@ -216,22 +216,19 @@ namespace BLL
                     }
                     else
                     {
+                        List<string> roleIdList = new List<string>();
                         if (string.IsNullOrEmpty(projectId))
                         {
-
-                            buttons = (from x in db.Sys_ButtonToMenu
-                                       join y in db.Sys_ButtonPower on x.ButtonToMenuId equals y.ButtonToMenuId
-                                       where y.RoleId == user.RoleId && y.MenuId == menuId && x.MenuId == menuId
-                                       select x).ToList();
+                            roleIdList = user.RoleId.Split(',').ToList();
                         }
                         else
                         {
-                            List<string> roleIdList = UserService.GetRoleListByProjectIdUserId(projectId, userId);
-                            buttons = (from x in db.Sys_ButtonToMenu
-                                       join y in db.Sys_ButtonPower on x.ButtonToMenuId equals y.ButtonToMenuId
-                                       where roleIdList.Contains(y.RoleId) && y.MenuId == menuId && x.MenuId == menuId
-                                       select x).ToList();
+                            roleIdList = UserService.GetRoleListByProjectIdUserId(projectId, userId);
                         }
+                        buttons = (from x in db.Sys_ButtonToMenu
+                                   join y in db.Sys_ButtonPower on x.ButtonToMenuId equals y.ButtonToMenuId
+                                   where roleIdList.Contains(y.RoleId) && y.MenuId == menuId && x.MenuId == menuId
+                                   select x).ToList();
                     }
                 }
 
diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls
index 1ebef08..344bacf 100644
Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/考试试题模版.xls differ