SVN r1002

SVN-Revision: r1002
2025-09-28 06:52:11 +00:00
parent c27ead7e09
commit 8a41c8f764
4 changed files with 52 additions and 40 deletions
@@ -3524,6 +3524,12 @@ namespace Lskj.Main.Control
            try
            {
                string menuId = lueUserName.EditValue;
+
+                if (lueUserName._popup.GridViewObj.GetFocusedDataRow()==null) 
+                {
+                    menuId = "";
+                }
+
                if (!string.IsNullOrEmpty(menuId))
                {
                    DataRow[] rowItems = this._allMenus.Select("MenuId=" + menuId);
@@ -3743,14 +3749,14 @@ namespace Lskj.Main.Control
                DBConfig.Instance.ServerName = serverIP;
                DBConfig.Instance.DataBase = dbName;
                DBConfig.Instance.IsInternalNetwork = isInternal;
-                if (!DBConfig.Instance.CreateConnection())
+                if (!DBConfig.Instance.CreateConnection(DBConfig.Instance.Connection))
                {
                    MessageUtil.Show(ResourceKeys.ServerAddressFault);
                    return false;
                }
                else
                {
-                    if (DelphiHelper.Delphi_Init(new StringBuilder(DBConfig.Instance.GetDelphiConnection())) == 0)
+                    if (DelphiHelper.Delphi_Init(new StringBuilder(DBConfig.Instance.GetDelphiConnection(DBConfig.Instance.dephiConnection))) == 0)
                    {
                        MessageUtil.Show(ResourceKeys.UnConnectServer + "[By Delphi]");
                        return false;