SVN r725

SVN-Revision: r725

插件库/Lskj.Business/Impl/BillImpl.cs

@@ -420,6 +420,10 @@ namespace Lskj.Business.Impl
                 sumCond += ",a.LookUpWidth ";
             if (HasExistsColumn("p_systembillDetail", "LookUpFieldsWidth"))
                 sumCond += ",a.LookUpFieldsWidth ";
+            if (HasExistsColumn("p_systembillDetail", "PrivilegeView"))
+                sumCond += ",a.PrivilegeView ";
+            if (HasExistsColumn("p_systembillDetail", "PrivilegeOper"))
+                sumCond += ",a.PrivilegeOper ";
 
             string columsSql = string.Format(@"SELECT DISTINCT
                             isnull(CASE WHEN ISNULL(b.userList,'')='' AND ISNULL(a.PrivilegeView,'')<>'' OR isnull(isVisible,0)=1 THEN 0 ELSE width END,0) width,

插件库/Lskj.Business/Impl/PowerImpl.cs

@@ -549,6 +549,22 @@ namespace Lskj.Business.Impl
             return GetDataTableResult(Sql);
         }
 
+        /// <summary>
+        /// <para>说明：获得启用的权限分类</para>
+        /// <para>创建人：曹屹峰</para>
+        /// <para>创建日期：2024-03-25 </para>
+        /// <para>修改人：</para>
+        /// <para>修改日期：</para>
+        /// <para>修改备注：</para>
+        /// <para>版本：1.0</para>
+        /// </summary>
+        /// <returns>System.Int32.</returns>
+        public static DataTable GetModuleAuthorityEnable(string tab)
+        {
+            string Sql = string.Format(@"select * from P_SYSTEMPRIVILEGE  where  modId='{0}'  and isnull(isVisible,0)=0 order by privTypeId", tab);
+            return GetDataTableResult(Sql);
+        }
+
         /// <summary>
         /// <para>说明：角色中人员变化后，刷新对应的权限分类</para>
         /// <para>创建人：曹屹峰</para>

插件库/Lskj.Business/Impl/SystemInfo.cs

@@ -232,6 +232,9 @@ namespace Lskj.Business
             Instance.StartMessageBox = item.Table.Columns.Contains("StartMessageBox") && !string.IsNullOrEmpty(item["StartMessageBox"] + "") ? "1".Equals(item["StartMessageBox"] + "") : false;
             Instance.MessageRefreshTime = item.Table.Columns.Contains("MessageRefreshTime") && !string.IsNullOrEmpty(item["MessageRefreshTime"] + "") ? Convert.ToInt32(item["MessageRefreshTime"] + "") : 0;
             Instance.MessageFlicker = item.Table.Columns.Contains("MessageFlicker") && !string.IsNullOrEmpty(item["MessageFlicker"] + "") ? "1".Equals(item["MessageFlicker"] + "") : false;
+            Instance.MessageShowWindow = item.Table.Columns.Contains("MessageShowWindow") && !string.IsNullOrEmpty(item["MessageShowWindow"] + "") ? "1".Equals(item["MessageShowWindow"] + "") : false;
+            Instance.MessageExitByMain = item.Table.Columns.Contains("MessageExitByMain") && !string.IsNullOrEmpty(item["MessageExitByMain"] + "") ? "1".Equals(item["MessageExitByMain"] + "") : false;
+            Instance.MessageHighlightColour  = item.Table.Columns.Contains("MessageHighlightColour") && !string.IsNullOrEmpty(item["MessageHighlightColour"] + "") ? item["MessageHighlightColour"] + "" : "";
             Instance.HideGallerys = item.Table.Columns.Contains("HideGallerys") && !string.IsNullOrEmpty(item["HideGallerys"] + "") ? "1".Equals(item["HideGallerys"] + "") : false;
             Instance.IsOpenWork = item.Table.Columns.Contains("IsOpenWork") && !string.IsNullOrEmpty(item["IsOpenWork"] + "") ? "1".Equals(item["IsOpenWork"] + "") : false;
             Instance.ShowGallerysFromMenu = item.Table.Columns.Contains("ShowGallerysFromMenu") && !string.IsNullOrEmpty(item["ShowGallerysFromMenu"] + "") ? "1".Equals(item["ShowGallerysFromMenu"] + "") : false;
@@ -736,10 +739,22 @@ namespace Lskj.Business
         /// </summary>
         public int MessageRefreshTime;
         /// <summary>
-        /// 消息框刷默认闪烁
+        /// 消息框刷新默认闪烁
         /// </summary>
         public bool MessageFlicker;
         /// <summary>
+        /// 消息框默认弹窗
+        /// </summary>
+        public bool MessageShowWindow;
+        /// <summary>
+        /// 消息框默认随主程序退出
+        /// </summary>
+        public bool MessageExitByMain;
+        /// <summary>
+        /// 消息框中消息高亮显示
+        /// </summary>
+        public string MessageHighlightColour;
+        /// <summary>
         /// 主界面隐藏快捷菜单界面
         /// </summary>
         public bool HideGallerys;