提交当前本机整理版本
This commit is contained in:
@@ -264,9 +264,10 @@ namespace Lskj.Main
|
||||
}
|
||||
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.LoginUsername))
|
||||
if (!string.IsNullOrWhiteSpace(SystemInfo.Instance.LoginUsername)&& BaseImpl.HasExistsColumn("P_EmployeeTab", SystemInfo.Instance.LoginUsername))
|
||||
{
|
||||
this.DisplayName= SystemInfo.Instance.LoginUsername;
|
||||
arg+= " ,"+ this.DisplayName;
|
||||
}
|
||||
|
||||
//if (BaseImpl.HasExistsColumn("P_EmployeeTab", "DefaultLedger"))
|
||||
@@ -274,7 +275,7 @@ namespace Lskj.Main
|
||||
BaseImpl.HasExistsColumn("P_SystemTab", "LoginPopupFlag", "int");
|
||||
lueUserName.Focus();
|
||||
lueUserName.ValueField = lueUserName.ValueMember = "UserId";
|
||||
lueUserName.TextMember = "UserName";
|
||||
lueUserName.TextMember = this.DisplayName;
|
||||
lueUserName.SourceSQL = string.Format("select EmployeeId UserId,LoginAccount UserCode,EmployeeName UserName {0} from P_EmployeeTab WHERE sign=0 and UseFlag=1", arg);
|
||||
|
||||
if (SystemInfo.Instance.DisplayUserCode)
|
||||
@@ -291,7 +292,7 @@ namespace Lskj.Main
|
||||
|
||||
|
||||
lueUserName.AutoShowPopup = "1".Equals(BaseImpl.GetResult("SELECT LoginPopupFlag FROM P_SystemTab") + "");
|
||||
DataRow[] rowItems = _userTable.Select(" UserName = '" + DBConfig.Instance.LoginName + "'");
|
||||
DataRow[] rowItems = _userTable.Select(" "+ DisplayName + " = '" + DBConfig.Instance.LoginName + "'");
|
||||
DataRow[] rowItemsUserCode = _userTable.Select(" UserCode = '" + DBConfig.Instance.LoginName + "'");
|
||||
if (rowItems != null && rowItems.Length > 0)
|
||||
{
|
||||
@@ -515,7 +516,7 @@ namespace Lskj.Main
|
||||
MessageUtil.Show(responseinfo.msg);
|
||||
return isLoginSucess;
|
||||
}
|
||||
DataRow[] drRows = table.Select("UserName='" + userName + "' or UserCode='" + userName + "'");//找到所有UserNAme或UserCode为xxx的用户
|
||||
DataRow[] drRows = table.Select(""+DisplayName+"='" + userName + "' or UserCode='" + userName + "'");//找到所有UserNAme或UserCode为xxx的用户
|
||||
if ((drRows == null) || (drRows.Count() < 1))
|
||||
{
|
||||
MessageUtil.Show(ResourceKeys.NameOrPasswordError);
|
||||
@@ -1694,7 +1695,7 @@ namespace Lskj.Main
|
||||
if (this.language.Visible)
|
||||
{
|
||||
DataTable dataTable = this.lueUserName.DataSource as DataTable;
|
||||
DataRow[] array = dataTable.Select("UserName='" + UserName + "'");
|
||||
DataRow[] array = dataTable.Select(""+DisplayName+"='" + UserName + "'");
|
||||
DataRow dataRow = array.Length > 0 ? array[0] : null;
|
||||
if (dataRow != null && !string.IsNullOrWhiteSpace(dataRow["useLanguage"] + ""))
|
||||
{
|
||||
@@ -1724,7 +1725,7 @@ namespace Lskj.Main
|
||||
if (SystemInfo.Instance.AccountSwitchingRestrictions > 0)
|
||||
{
|
||||
DataTable dataTable = this.lueUserName.DataSource as DataTable;
|
||||
DataRow[] array = dataTable.Select("UserName='" + UserName + "'");
|
||||
DataRow[] array = dataTable.Select("" + DisplayName + "='" + UserName + "'");
|
||||
DataRow dataRow = array.Length > 0 ? array[0] : null;
|
||||
if (dataRow != null)
|
||||
{
|
||||
@@ -1890,4 +1891,33 @@ namespace Lskj.Main
|
||||
if (SystemInfo.Instance.OAUrl.EndsWith("/"))
|
||||
{
|
||||
forgetPwdUrl = $"{SystemInfo.Instance.OAUrl}lserp_v8/index.html?verify=1";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
forgetPwdUrl = $"{SystemInfo.Instance.OAUrl}/lserp_v8/index.html?verify=1";
|
||||
}
|
||||
frmWebBrowser.FrmLoad(forgetPwdUrl, 1, false);
|
||||
baseForm.ShowDialog();
|
||||
}
|
||||
}
|
||||
|
||||
private void OnCheckPwdClick(object sender, EventArgs e)
|
||||
{
|
||||
if (isPlaintextPwd)
|
||||
{
|
||||
//加密
|
||||
txtPassword.Properties.PasswordChar = '*';
|
||||
checkPwd.Image = Properties.Resources.密码显示; // 睁眼图标
|
||||
toolTip.SetToolTip(checkPwd, "显示密码");
|
||||
}
|
||||
else
|
||||
{
|
||||
//明文显示
|
||||
txtPassword.Properties.PasswordChar = '\0';
|
||||
checkPwd.Image = Properties.Resources.密码不显示; // 睁眼图标
|
||||
toolTip.SetToolTip(checkPwd, "隐藏密码");
|
||||
}
|
||||
isPlaintextPwd = !isPlaintextPwd;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user