From 76011a9e04571f41f6725ebb8fb91e0c8b9656d5 Mon Sep 17 00:00:00 2001 From: "Arin(asus)" Date: Fri, 18 Jul 2025 10:35:04 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=82=AC=EC=9A=A9=EC=9E=90=EB=AA=A9=EB=A1=9D]?= =?UTF-8?q?=20=EC=86=8C=EC=86=8D=EA=B7=B8=EB=A3=B9=EC=9D=98=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=EB=A7=8C=20=EB=B3=B4=EC=9D=B4=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95,=20=EC=86=8C=EC=86=8D=EA=B7=B8?= =?UTF-8?q?=EB=A3=B9=EC=9D=84=20=EB=B3=80=EA=B2=BD=ED=95=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=97=86=EB=8F=84=EB=A1=9D=20=ED=95=A8,=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EA=B0=80=20=EC=97=86=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EC=9A=B0=20=EB=B0=9C=EC=83=9D=EB=90=98=EB=8A=94=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- unimarc/unimarc/Skill.cs | 18 ++++++++++++------ unimarc/unimarc/홈/Home_User_manage.cs | 11 ++++++++--- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/unimarc/unimarc/Skill.cs b/unimarc/unimarc/Skill.cs index 3169d21..bad5b26 100644 --- a/unimarc/unimarc/Skill.cs +++ b/unimarc/unimarc/Skill.cs @@ -23,6 +23,7 @@ using System.Drawing.Text; using System.Globalization; using System.Threading; using System.Data.SqlTypes; +using AR; namespace WindowsFormsApp1 { @@ -2962,16 +2963,21 @@ namespace WindowsFormsApp1 public string VersionInfo() { string version = ""; - StreamReader sr = new StreamReader(Application.StartupPath + "\\update.inf"); - while (!sr.EndOfStream) + var fn = Application.StartupPath + "\\update.inf"; + if(System.IO.File.Exists(fn)) { - string line = sr.ReadLine(); - if (line.IndexOf("count=", 0) != -1) + StreamReader sr = new StreamReader(fn); + while (!sr.EndOfStream) { - version = line.Replace("count=", ""); - break; + string line = sr.ReadLine(); + if (line.IndexOf("count=", 0) != -1) + { + version = line.Replace("count=", ""); + break; + } } } + return version; } } diff --git a/unimarc/unimarc/홈/Home_User_manage.cs b/unimarc/unimarc/홈/Home_User_manage.cs index 399d873..3f5deb1 100644 --- a/unimarc/unimarc/홈/Home_User_manage.cs +++ b/unimarc/unimarc/홈/Home_User_manage.cs @@ -76,7 +76,11 @@ namespace WindowsFormsApp1.Home { dataGridView1.Rows.Clear(); string Area = "`name`, `position`, `Phone`, `ID`, `PW`,`affil`"; - string cmd = mDB.DB_Select_Search(Area, "User_Data");//, "affil", comp_name); + + //여기서 모든 사용자를 가져온다 + //사용자그룹의 데이터만 오게하려면 affil을 적용해야함 250718 + //사용자그룹을 선택하는것이 맞는가? + string cmd = mDB.DB_Select_Search(Area, "User_Data", "affil", comp_name); string db_res = mDB.DB_Send_CMD_Search(cmd); string[] data = db_res.Split('|'); string[] grid = { "", "", "", "", "", "", "" }; @@ -163,7 +167,8 @@ namespace WindowsFormsApp1.Home { int row = e.RowIndex; if (dataGridView1.CurrentCell == null || dataGridView1.CurrentCell.RowIndex < 0 || dataGridView1.SelectedRows.Count == 0) return; - cbCompany.Text = dataGridView1.Rows[row].Cells["affil"].Value.ToString(); ; + cbCompany.Text = dataGridView1.Rows[row].Cells["affil"].Value.ToString(); + cbCompany.Enabled = false; tb_ID.Text = dataGridView1.Rows[row].Cells["ID"].Value.ToString(); tb_PW.Text = dataGridView1.Rows[row].Cells["PW"].Value.ToString(); tb_Name.Text = dataGridView1.Rows[row].Cells["Per_Name"].Value.ToString(); @@ -205,7 +210,7 @@ namespace WindowsFormsApp1.Home for (int a = 0; a < chkBox.Length; a++) { - if (IsCheck[a] == "1") + if (a <= IsCheck.Length && IsCheck[a] == "1") //정보가없더라도 진행하게 chkBox[a].Checked = true; else chkBox[a].Checked = false;