diff --git a/插件库/Lskj.Business/Impl/PowerImpl.cs b/插件库/Lskj.Business/Impl/PowerImpl.cs index ab6b375..b937a3c 100644 --- a/插件库/Lskj.Business/Impl/PowerImpl.cs +++ b/插件库/Lskj.Business/Impl/PowerImpl.cs @@ -407,7 +407,7 @@ namespace Lskj.Business.Impl (select MenuCaption from P_FormMenuConfigTab where subsysid=a.SubSysId and len(menustruct)=2 and MenuStruct=left(a.menustruct,2) and useFlag=1) as SecondaryDirectory, convert(varchar(50), a.SubSysId)+'_'+ MenuStruct ID ,MenuId,MenuCaption,PurviewId,'0' as Editflag ,'0' as Readflag,DllFilename from P_FormMenuConfigTab a left join P_SubSystemTab b on a.SubSysId=b.SubSysId - order by MenuId"; + order by FirstDirectory,SecondaryDirectory"; return GetDataTableResult(sqlValue); diff --git a/插件库/Lskj.Business/Impl/SystemInfo.cs b/插件库/Lskj.Business/Impl/SystemInfo.cs index bd9e33f..b7c2808 100644 --- a/插件库/Lskj.Business/Impl/SystemInfo.cs +++ b/插件库/Lskj.Business/Impl/SystemInfo.cs @@ -307,6 +307,7 @@ namespace Lskj.Business Instance.HideFlowchartTab = item.Table.Columns.Contains("HideFlowchartTab") && !string.IsNullOrEmpty(item["HideFlowchartTab"] + "") ? "1".Equals(item["HideFlowchartTab"] + "") : false; Instance.SpecialReverseStep = item.Table.Columns.Contains("SpecialReverseStep") && !string.IsNullOrEmpty(item["SpecialReverseStep"] + "") ? "1".Equals(item["SpecialReverseStep"] + "") : false; Instance.MainProhibitSwitchingAccount = item.Table.Columns.Contains("MainProhibitSwitchingAccount") && !string.IsNullOrEmpty(item["MainProhibitSwitchingAccount"] + "") ? "1".Equals(item["MainProhibitSwitchingAccount"] + "") : false; + Instance.BillAddAtTheEnd = item.Table.Columns.Contains("BillAddAtTheEnd") && !string.IsNullOrEmpty(item["BillAddAtTheEnd"] + "") ? "1".Equals(item["BillAddAtTheEnd"] + "") : false; } /// /// 高拍仪AccessKey @@ -1007,4 +1008,8 @@ namespace Lskj.Business /// public bool HideFixedConditions; /// - /// 分组时快捷菜单是否显 \ No newline at end of file + /// 分组时快捷菜单是否显示在内部 + /// + public bool ShowGrallyInTop; + /// + /// 审核反退默认选中 \ No newline at end of file