SVN r993

SVN-Revision: r993

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

@@ -426,6 +426,11 @@ namespace Lskj.Business.Impl
             string rMsg = pMsg.Value.ToString();
             int result = Convert.ToInt32(returnValue.Value + "");
 
+            if (result==-1&& ERPInfo.Instance.UserName.Equals("管理员")) 
+            {
+               
+            }
+
             model.Success = result == 1;
             model.FaultMsg = rMsg;
             return result;
@@ -496,6 +501,9 @@ namespace Lskj.Business.Impl
             string rMsg = pMsg.Value.ToString();
 
             int result = Convert.ToInt32(returnValue.Value + "");
+
+           
+
             retuenMsg = result + "";
             model.Success = result == 1;
             model.FaultMsg = rMsg;
@@ -1156,7 +1164,7 @@ namespace Lskj.Business.Impl
             {
                 foreach (DataRow item in rightMentTab.Rows)
                 {
-                    if (item.Table.Columns.Contains("IcoName") && !string.IsNullOrEmpty(item["IcoName"] + ""))
+                    if ((item.Table.Columns.Contains("IcoName") && !string.IsNullOrEmpty(item["IcoName"] + ""))||(item.Table.Columns.Contains("showtoolbar") && !string.IsNullOrEmpty(item["showtoolbar"] + "")))
                     {
                         result = true;
                         break;

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

@@ -309,6 +309,8 @@ namespace Lskj.Business
             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;
             Instance.WatermarkContent = item.Table.Columns.Contains("WatermarkContent") && !string.IsNullOrEmpty(item["WatermarkContent"] + "") ? item["WatermarkContent"] + "" : "";
+            Instance.HiddenNotification = item.Table.Columns.Contains("HiddenNotification") && !string.IsNullOrEmpty(item["HiddenNotification"] + "") ? "1".Equals(item["HiddenNotification"] + "") : false;
+            Instance.HiddenServerSetting = item.Table.Columns.Contains("HiddenServerSetting") && !string.IsNullOrEmpty(item["HiddenServerSetting"] + "") ? "1".Equals(item["HiddenServerSetting"] + "") : false;
         }
         /// <summary>
         /// 高拍仪AccessKey
@@ -1017,4 +1019,13 @@ namespace Lskj.Business
         /// </summary>
         public bool ShowGrallyInTop;
         /// <summary>
-        /// 审核反退默认选中��
+        /// 审核反退默认选中提交人
+        /// </summary>
+        public bool FallbackDefaultSelection;
+        /// <summary>
+        /// 单表隐藏 刷新列数据 按钮
+        /// </summary>
+        public bool FoundationHideTableRefresh;
+        /// <summary>
+        /// 反审url
+