This commit is contained in:
parent
47581c2dcb
commit
39a8b67c25
|
@ -106,7 +106,7 @@ namespace BLL
|
||||||
var getMenus = from x in db.Sys_Menu
|
var getMenus = from x in db.Sys_Menu
|
||||||
where x.IsUsed == true
|
where x.IsUsed == true
|
||||||
&& (x.MenuType == Const.Menu_Server || x.MenuType == Const.Menu_Person ||
|
&& (x.MenuType == Const.Menu_Server || x.MenuType == Const.Menu_Person ||
|
||||||
x.MenuType == Const.Menu_HSSE || x.MenuType==Const.Menu_CQMS || x.MenuType == Const.Menu_HJGL
|
x.MenuType == Const.Menu_HSSE || x.MenuType == Const.Menu_CQMS || x.MenuType == Const.Menu_HJGL
|
||||||
|| x.MenuType == Const.Menu_PZHGL)
|
|| x.MenuType == Const.Menu_PZHGL)
|
||||||
select x;
|
select x;
|
||||||
List<Model.Sys_Menu> menus = new List<Model.Sys_Menu>();
|
List<Model.Sys_Menu> menus = new List<Model.Sys_Menu>();
|
||||||
|
@ -163,7 +163,8 @@ namespace BLL
|
||||||
{
|
{
|
||||||
if (!string.IsNullOrEmpty(getUser.RoleId))
|
if (!string.IsNullOrEmpty(getUser.RoleId))
|
||||||
{
|
{
|
||||||
var power = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.MenuId == menuId && x.RoleId == getUser.RoleId);
|
List<string> roleIdList = getUser.RoleId.Split(',').ToList();
|
||||||
|
var power = Funs.DB.Sys_RolePower.FirstOrDefault(x => x.MenuId == menuId && roleIdList.Contains(x.RoleId));
|
||||||
if (power != null)
|
if (power != null)
|
||||||
{
|
{
|
||||||
returnValue = true;
|
returnValue = true;
|
||||||
|
@ -382,7 +383,7 @@ namespace BLL
|
||||||
/// <param name="userId"></param>
|
/// <param name="userId"></param>
|
||||||
/// <param name="menuType"></param>
|
/// <param name="menuType"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static bool IsHaveSystemPower(string userId,string menuType, string projectId)
|
public static bool IsHaveSystemPower(string userId, string menuType, string projectId)
|
||||||
{
|
{
|
||||||
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
|
using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString))
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,10 +27,10 @@
|
||||||
<Toolbars>
|
<Toolbars>
|
||||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
|
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
|
||||||
<Items>
|
<Items>
|
||||||
<f:TextBox runat="server" Label="名称" ID="txtRoleName" EmptyText="输入查询条件"
|
<f:TextBox runat="server" Label="名称" ID="txtRoleName" EmptyText="输入查询条件" LabelAlign="Right"
|
||||||
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
|
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px">
|
||||||
</f:TextBox>
|
</f:TextBox>
|
||||||
<f:RadioButtonList runat="server" ID="rbIsOfficce" Label="类型" LabelWidth="90px"
|
<f:RadioButtonList runat="server" ID="rbIsOfficce" Label="类型" LabelWidth="80px" Width="280px" LabelAlign="Right"
|
||||||
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||||
<f:RadioItem Text="本部角色" Value="1" />
|
<f:RadioItem Text="本部角色" Value="1" />
|
||||||
<f:RadioItem Text="项目角色" Value="0" Selected ="true"/>
|
<f:RadioItem Text="项目角色" Value="0" Selected ="true"/>
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
</f:Grid>
|
</f:Grid>
|
||||||
</PopPanel>
|
</PopPanel>
|
||||||
</f:DropDownBox>
|
</f:DropDownBox>
|
||||||
<f:RadioButtonList ID="rbMenuType" Label="菜单类型" runat="server" LabelWidth="80px"
|
<f:RadioButtonList ID="rbMenuType" Label="菜单类型" runat="server" LabelWidth="80px" Width="280px"
|
||||||
AutoPostBack="true" OnSelectedIndexChanged="rbMenuType_SelectedIndexChanged">
|
AutoPostBack="true" OnSelectedIndexChanged="rbMenuType_SelectedIndexChanged">
|
||||||
<f:RadioItem Selected="true" Text="本部菜单" Value="MenuType_S"/>
|
<f:RadioItem Selected="true" Text="本部菜单" Value="MenuType_S"/>
|
||||||
<f:RadioItem Text="项目菜单" Value="MenuType_P"/>
|
<f:RadioItem Text="项目菜单" Value="MenuType_P"/>
|
||||||
|
|
Loading…
Reference in New Issue