From 3d6533f1381e3e513ffb3d65bf34fb254f967088 Mon Sep 17 00:00:00 2001
From: lg <999544862qq.com>
Date: 星期五, 06 九月 2024 11:39:04 +0800
Subject: [PATCH] 优化系统模块下面的增删改查

---
 DevApp/Gs.DevApp/DevFrm/FrmLogin.cs |   45 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
index 142ff73..d02f0c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FrmLogin.cs
@@ -4,6 +4,7 @@
 using System.Windows.Forms;
 using Gs.DevApp.Models;
 using Newtonsoft.Json.Linq;
+using System.Data;
 
 namespace Gs.DevApp.DevFrm
 {
@@ -12,12 +13,37 @@
         public FrmLogin()
         {
             InitializeComponent();
-            this.Text=lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
+            this.Text = lbVersion.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("ProductName").ToString();
             btnLogin.Click += BtnLogin_Click;
             btnCancel.Click += BtnCancel_Click;
             UtilityHelper.SetFont(panel1);
+            getTree();
         }
 
+        private void getTree()
+        {
+            Models.PageQueryModel pgq = new Models.PageQueryModel(1, 999999, "factory", "asc", "", "and upGuid is not null");
+            string json = JsonConvert.SerializeObject(pgq);
+            string strReturn = "";
+            try
+            {
+                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;
+            }
+            catch (Exception ex)
+            {
+                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
         private void BtnCancel_Click(object sender, EventArgs e)
         {
             if (MsgHelper.AskQuestion("纭畾瑕侀��鍑虹郴缁熷悧?"))
@@ -28,15 +54,12 @@
 
         private void BtnLogin_Click(object sender, EventArgs e)
         {
-            int i = 100;
-            Gs.DevApp.UserControl.ShowDialogForm sdf = new Gs.DevApp.UserControl.ShowDialogForm("鎻愮ず", "", "璇疯�愬績绛夊�欙紝姝e湪楠岃瘉鎮ㄧ殑韬唤锛�");
             var _obj = new
             {
-                accountPwd = txtUser.Text.Trim(),
-                accountNo = txtPwd.Text.Trim(),
-                orgGuid = Guid.NewGuid()
+                accountPwd = txtPwd.Text.Trim(),
+                accountNo = txtUser.Text.Trim(),
+                orgGuid = comOrg.SelectedValue
             };
-            sdf.SetCaption("鎵ц杩涘害锛�" + (i - 80) + "/" + i.ToString() + "锛�");
             try
             {
                 string strJson = UtilityHelper.HttpPost("", "User/UserLogin", JsonConvert.SerializeObject(_obj));
@@ -47,21 +70,21 @@
                     LoginInfoModel.CurrentUser.LoginUserGuid = _login["loginGuid"].ToString();
                     LoginInfoModel.CurrentUser.LoginOrgGuid = _login["loginOrgGuid"].ToString();
                     LoginInfoModel.CurrentUser.LoginTime = DateTime.Now.ToString("yyyy-MM-dd hh:mm");
+                    LoginInfoModel.CurrentUser.LoginFactory = _login["loginFactory"].ToString();
+                    this.DialogResult = DialogResult.OK;
                 }
                 else
                 {
                     ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    this.DialogResult = DialogResult.None;
                 }
-                sdf.SetCaption("鎵ц杩涘害锛�" + (i - 10) + "/" + i.ToString() + "锛�");
             }
             catch (Exception ex)
             {
-                sdf.Close();
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 return;
             }
-            sdf.Close();
-            this.DialogResult = DialogResult.OK;
+
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3