From 39965ac16351d5b814ea4cdaf8017695ba42530f Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期一, 30 五月 2022 13:36:19 +0800
Subject: [PATCH] 修改了选机台直接根据系统登录人员过滤功能

---
 BLL/公用模块/FrmLogin.cs |   49 +++++++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 22 deletions(-)

diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
index 00253fd..af3aed1 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/FrmLogin.cs"
@@ -22,7 +22,7 @@
         private void SetCmbAccount(string sServer)//cmb涓缃笎濂�  //Lock
         {
             ClsCNmaster oCn = new ClsCNmaster();
-            DataSet DS ;
+            DataSet DS;
             try
             {
                 DS = oCn.RunProcReturn("select * from HDSystem_DataBases where YNuse=1 ", "HDSystem_DataBases", ref ClsPub.sExeReturnInfo);
@@ -40,7 +40,7 @@
                 {
                     cmbAccount.SelectedIndex = 0;
                     ClsIni oIni = new ClsIni();
-                    string sNumber = ClsIni.ReadIni("Erp", "DataBaseNumber",DBUtility.ClsPub.AppPath + @"/HXErp.ini");
+                    string sNumber = ClsIni.ReadIni("Erp", "DataBaseNumber", DBUtility.ClsPub.AppPath + @"/HXErp.ini");
                     for (int j = 0; j < cmbAccount.Items.Count; j++)
                     {
                         if (sNumber.Trim() == cmbAccount.Items[j].ToString().Trim())
@@ -56,7 +56,7 @@
 
         private bool CheckServer()//妫�鏌ユ湇鍔″櫒鍚嶆纭��  //Lock
         {
-            ClsCN oCn=new ClsCN(); 
+            ClsCN oCn = new ClsCN();
             if (oCn.CheckOpen())
             {
                 lblStatus.Text = "鏈嶅姟鍣ㄨ繛鎺ユ垚鍔�";
@@ -109,19 +109,19 @@
             string sDataBase_K3 = "";
             string sDataBase_K32 = "";
             string sDataBase_K33 = "";
-            sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(),ref sDataBase_K3);       
+            sDataBase = oCn.GetDataBase(cmbAccount.Text.Trim(), ref sDataBase_K3);
             ClsIni oIni = new ClsIni();
             ClsIni.WriteIni("Erp", "DataBase", sDataBase.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
             ClsIni.WriteIni("K3Erp", "DataBase", sDataBase_K3.Trim(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
             DAL.ClsUser oUser = new DAL.ClsUser();
-            
-            ds = oUser.CheckCzymc(cmbUser.Text.Trim(),ClsPub.StrToPsd( txtPsd.Text.Trim()));
-            if (ds ==null)
+
+            ds = oUser.CheckCzymc(cmbUser.Text.Trim(), ClsPub.StrToPsd(txtPsd.Text.Trim()));
+            if (ds == null)
             {
                 MessageBox.Show("閫夋嫨鐨勫笎濂椾笉瀛樺湪锛�", "鎻愮ず");
                 return;
             }
-            if (ds.Tables[0].Rows.Count >0)
+            if (ds.Tables[0].Rows.Count > 0)
             {
                 ClsPub.CurUserID = ds.Tables[0].Rows[0]["Czybm"].ToString();
                 this.Close();
@@ -135,7 +135,7 @@
             //寰楀埌褰撳墠浼氳鏈熼棿
             int sYear = 0;
             int sPeriod = 0;
-            if (!ClsPub.Sub_GetCurPeriod(ref sYear,ref sPeriod))
+            if (!ClsPub.Sub_GetCurPeriod(ref sYear, ref sPeriod))
             {
                 MessageBox.Show("寰楀埌褰撳墠浼氳鏈熼棿澶辫触锛�", "鎻愮ず", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 isOk = false;
@@ -162,18 +162,18 @@
             }
             foreach (string eachStr in listStr)
             {
-                UserName = UserName+eachStr + ",";
+                UserName = UserName + eachStr + ",";
             }
             UserName = UserName.Remove(UserName.LastIndexOf(","), 1);
             //
-            ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini"); 
+            ClsIni.WriteIni("UserInfo", "UserName", UserName, DBUtility.ClsPub.AppPath + @"/HXERP.ini");
             ClsIni.WriteIni("UserInfo", "HOrgName", cmbHOrg.Text.ToString(), DBUtility.ClsPub.AppPath + @"/HXERP.ini");
             ClsPub.CurUserName = cmbUser.Text.Trim();
             ClsPub.AppPath = System.Environment.CurrentDirectory;
             ClsPub.HOrgID = ClsPub.get_ORGANIZATIONSIDByName(ClsPub.isStrNull(cmbHOrg.Text));
             ClsPub.HOrgNumber = ClsPub.get_ORGANIZATIONSNOByName(ClsPub.isStrNull(cmbHOrg.Text));
             ClsPub.HOrgName = ClsPub.isStrNull(cmbHOrg.Text);
-            if(chkRemember.Checked==true  ) 
+            if (chkRemember.Checked == true)
             {
                 ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
                 ClsIni.WriteIni("UserInfo", "Remember", "1", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
@@ -183,7 +183,7 @@
                 ClsIni.WriteIni("UserInfo", "UserPsd", "", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
                 ClsIni.WriteIni("UserInfo", "Remember", "0", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
             }
-            
+
         }
 
         private void txtUser_KeyUp(object sender, KeyEventArgs e)
@@ -194,8 +194,8 @@
 
         private void txtPsd_KeyUp(object sender, KeyEventArgs e)
         {
-            if (e.KeyValue == 13)  
-            this.btnOK_Click(sender,e);
+            if (e.KeyValue == 13)
+                this.btnOK_Click(sender, e);
         }
 
         private void timer1_Tick(object sender, EventArgs e)
@@ -207,7 +207,7 @@
             }
             ClsIni oIni = new ClsIni();
             //
-            UserName = ClsIni.ReadIni("UserInfo", "UserName",DBUtility.ClsPub.AppPath +  @"/HXERP.ini");
+            UserName = ClsIni.ReadIni("UserInfo", "UserName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
 
             string[] strArr = UserName.Split(',');
             foreach (string str in strArr)
@@ -216,7 +216,7 @@
             }
             cmbUser.SelectedIndex = 0;
             //
-            txtUser.Text = ClsIni.ReadIni("UserInfo", "UserName", DBUtility.ClsPub.AppPath +  @"/HXERP.ini");
+            txtUser.Text = ClsIni.ReadIni("UserInfo", "UserName", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
             if (ClsIni.ReadIni("UserInfo", "Remember", DBUtility.ClsPub.AppPath + @"/HXERP.ini") == "1")
             {
                 txtPsd.Text = ClsIni.ReadIni("UserInfo", "UserPsd", DBUtility.ClsPub.AppPath + @"/HXERP.ini");
@@ -224,8 +224,8 @@
             }
             else
             {
-                txtPsd.Text ="";
-                chkRemember.Checked = false ;
+                txtPsd.Text = "";
+                chkRemember.Checked = false;
             }
         }
 
@@ -319,8 +319,8 @@
         public DataSet get_ORGANIZATIONSList()
         {
             try
-            { 
-                return  ClsPub.get_ORGANIZATIONSList();
+            {
+                return ClsPub.get_ORGANIZATIONSList();
             }
             catch (Exception e)
             {
@@ -335,7 +335,7 @@
 
         private void label4_Click(object sender, EventArgs e)
         {
-            if (MessageBox.Show("纭畾瑕佹墜鍔ㄦ洿鏂扮▼搴忓悧锛熸湰绋嬪簭灏嗚嚜鍔ㄥ叧闂紒","鎻愮ず",MessageBoxButtons.OKCancel)==DialogResult.OK)
+            if (MessageBox.Show("纭畾瑕佹墜鍔ㄦ洿鏂扮▼搴忓悧锛熸湰绋嬪簭灏嗚嚜鍔ㄥ叧闂紒", "鎻愮ず", MessageBoxButtons.OKCancel) == DialogResult.OK)
             {
                 string strFileName = ClsPub.AppPath + @"/HX_Update.exe";
                 System.Diagnostics.Process.Start(strFileName);
@@ -347,6 +347,11 @@
         {
             //textBox1.Focus();
             string HPassWord = textBox1.Text.Trim().ToString();
+            if (HPassWord == null || HPassWord == "")
+            {
+                MessageBox.Show("璇峰埛鍗�");
+                return;
+            }
             //MessageBox.Show(HPassWord);
             SQLHelper.ClsCN oCn1 = new SQLHelper.ClsCN();
             //1.鏌ユ壘鏁版嵁搴撴搷浣滃憳绠$悊琛ㄩ噷闈㈡槸鍚︽湁瀵瑰簲杩欎釜鍔犲瘑瀛楃涓插搴旂殑璁板綍

--
Gitblit v1.9.1