From 65927056612a7ffef20708aefda33d09be51ef6b Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期日, 08 九月 2024 22:16:00 +0800
Subject: [PATCH] 权限整理
---
DevApp/Gs.DevApp/DevFrm/FrmLogin.cs | 56 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index d02f0c4..c624c79 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -16,13 +16,15 @@
this.Text = lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
btnLogin.Click += BtnLogin_Click;
btnCancel.Click += BtnCancel_Click;
- UtilityHelper.SetFont(panel1);
getTree();
+ getRemember();
}
-
+ /// <summary>
+ /// 璇诲彇缁勭粐
+ /// </summary>
private void getTree()
{
- Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "factory", "asc", "", "and upGuid is not null");
+ Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "factory", "asc", "", "and status=1");
string json = JsonConvert.SerializeObject(pgq);
string strReturn = "";
try
@@ -30,18 +32,15 @@
strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
ReturnModel<PageListModel> rtn = UtilityHelper.GetTableByJson(strReturn);
DataTable dt = rtn.rtnData.list;
- DataRow newRow = dt.NewRow();
- newRow["guid"] = "00000000-0000-0000-0000-000000000000";
- newRow["name"] = "-璇烽�夋嫨-";
- dt.Rows.Add(newRow);
comOrg.DataSource = dt;
comOrg.DisplayMember = "name";
comOrg.ValueMember = "guid";
- comOrg.SelectedIndex = dt.Rows.Count - 1;
+ comOrg.SelectedIndex = 0;
}
catch (Exception ex)
{
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ this.Close();
}
}
private void BtnCancel_Click(object sender, EventArgs e)
@@ -54,11 +53,29 @@
private void BtnLogin_Click(object sender, EventArgs e)
{
+ if (string.IsNullOrEmpty(txtUser.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
+ txtUser.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txtPwd.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("瀵嗙爜涓嶈兘涓虹┖锛�");
+ txtUser.Focus();
+ return;
+ }
+ if (comOrg.SelectedValue == null || string.IsNullOrEmpty(comOrg.SelectedValue.ToString().Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.Warning("缁勭粐鏈烘瀯涓嶈兘涓虹┖锛�");
+ txtUser.Focus();
+ return;
+ }
var _obj = new
{
accountPwd = txtPwd.Text.Trim(),
accountNo = txtUser.Text.Trim(),
- orgGuid = comOrg.SelectedValue
+ orgGuid = comOrg.SelectedValue.ToString().Trim()
};
try
{
@@ -67,6 +84,11 @@
JObject _login = _rtn.rtnData;
if (_rtn.rtnCode > 0)
{
+ Properties.Settings.Default.userName = (ckRemember.Checked ? txtUser.Text.Trim() : "");
+ Properties.Settings.Default.userPwd = (ckRemember.Checked ? txtPwd.Text.Trim() : "");
+ Properties.Settings.Default.orgguid = (ckRemember.Checked ? comOrg.SelectedValue.ToString() : "");
+ Properties.Settings.Default.remember = ckRemember.Checked;
+ Properties.Settings.Default.Save();
LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
LoginInfoModel.CurrentUser.LoginOrgGuid = _login["loginOrgGuid"].ToString();
LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
@@ -81,10 +103,22 @@
}
catch (Exception ex)
{
+ this.DialogResult = DialogResult.Cancel;
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- return;
}
-
+ }
+ /// <summary>
+ /// 璇诲彇璁颁綇瀵嗙爜
+ /// </summary>
+ private void getRemember()
+ {
+ if (Properties.Settings.Default.remember)
+ {
+ txtUser.Text = Properties.Settings.Default.userName;
+ txtPwd.Text = Properties.Settings.Default.userPwd;
+ comOrg.SelectedValue = Properties.Settings.Default.orgguid;
+ ckRemember.Checked = true;
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3