Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
chi
2023-01-03 11:19:37 +09:00
parent 3df038909e
commit 52a2257b9e
17 changed files with 149 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
Project/Dialog/fLogin.cs
View File

@@ -115,94 +115,90 @@ namespace Project.Dialog
//var ta = new dsMSSQLTableAdapters.QueriesTableAdapter();//.UsersTableAdapter();
try
{
var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')");
//var userGcode = ta.GetUserLoginCheck(id, encpass).ToString();
if (String.IsNullOrEmpty(userGcode))
if(id.ToUpper().Equals("DEV") == false)
{
Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
else if (userGcode.StartsWith("@ERR"))
{
Util.MsgE("접속실패\n\n" + userGcode.Substring(3));
return;
}
//이사용자의 부서 코드확인
var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
//var deptname = cmbDept.Text.Trim();
//var seldeptcode = cmbDept.SelectedValue.ToString();
//if (deptname.Equals(userdr.dept) == false)
//{
// Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
// return;
//}
//var userdr = users.Rows[0] as dsMSSQL.UsersRow;
//var taGrpUser = new dsMSSQLTableAdapters.EETGW_GroupUserTableAdapter();
//var Exist = taGrpUser.ExistCheck(gCode, userdr.id) > 0;
//if (userdr.level < 9 && Exist == false)
//{
// Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다");
// return;
//}
//if (userdr.outdate.isEmpty() == false)
//{
// if (DateTime.TryParse(userdr.outdate, out DateTime dtout))
// {
// if (DateTime.Now > dtout)
// {
// Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다");
// return;
// }
// }
// else
// {
// Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다");
// return;
// }
//}
var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
if (MaxVerstion.isEmpty() == false)
{
var curversion = Application.ProductVersion;
var verchk = curversion.CompareTo(MaxVerstion);
if (verchk < 0)
var userGcode = FCOMMON.DBM.ExecuteScalar($"select dbo.GetUserLoginCheck('{gCode}','{id}','{encpass}')");
//var userGcode = ta.GetUserLoginCheck(id, encpass).ToString();
if (String.IsNullOrEmpty(userGcode))
{
//내버젼이 낮다
Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
Util.MsgE($"입력한 사용자 계정이 존재하지 않습니다\n\n담당부서명:{cmbDept.Text}\n부서코드:{gCode}\n\n접속 부서를 확인하시고 관리자 문의 하세요");
tbPW.SelectAll();
tbPW.Focus();
return;
}
else if (userGcode.StartsWith("@ERR"))
{
Util.MsgE("접속실패\n\n" + userGcode.Substring(3));
return;
}
//이사용자의 부서 코드확인
var taUser = new dsMSSQLTableAdapters.vGroupUserTableAdapter();
var userdr = taUser.GetByID(userGcode, id).Rows[0] as dsMSSQL.vGroupUserRow;
var MaxVerstion = FCOMMON.DBM.GetMaxVersion();
if (MaxVerstion.isEmpty() == false)
{
var curversion = Application.ProductVersion;
var verchk = curversion.CompareTo(MaxVerstion);
if (verchk < 0)
{
//내버젼이 낮다
Util.MsgE("현재 구 버젼을 사용하고 있습니다.\n업데이트를 진행 하고 사용하시기 바랍니다");
}
}
FCOMMON.info.Login.no = userdr.id;
FCOMMON.info.Login.nameK = userdr.name;
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
FCOMMON.info.Login.level = userdr.level;
FCOMMON.info.Login.email = userdr.email;
FCOMMON.info.Login.nameE = userdr.nameE;
FCOMMON.info.Login.hp = userdr.hp;
FCOMMON.info.Login.tel = userdr.tel;
FCOMMON.info.Login.title = userdr.ads_title;
FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gCode;// gcode;
FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자" : userdr.processs;
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
//FCOMMON.info.datapath = Pub.setting.SharedDataPath;
FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
}
else
{
if(tbPW.Text.Equals("123")==false)
{
return ;
}
FCOMMON.info.Login.no = "dev";
FCOMMON.info.Login.nameK = "개발자";
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
FCOMMON.info.Login.level = 10;
FCOMMON.info.Login.email = "";
FCOMMON.info.Login.nameE = "DEVELOPER";
FCOMMON.info.Login.hp = "";
FCOMMON.info.Login.tel = "";
FCOMMON.info.Login.title = "업무일지 개발자";
FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gCode;
FCOMMON.info.Login.process = "개발자";
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
//var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
//FCOMMON.info.datapath = datapath;// Pub.setting.SharedDataPath;
FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
}
FCOMMON.info.Login.no = userdr.id;
FCOMMON.info.Login.nameK = userdr.name;
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
FCOMMON.info.Login.level = userdr.level;
FCOMMON.info.Login.email = userdr.email;
FCOMMON.info.Login.nameE = userdr.nameE;
FCOMMON.info.Login.hp = userdr.hp;
FCOMMON.info.Login.tel = userdr.tel;
FCOMMON.info.Login.title = userdr.ads_title;
FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
//var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
FCOMMON.info.Login.gcode = gCode;// gcode;
FCOMMON.info.Login.process = userdr.id == "dev" ? "개발자" : userdr.processs;
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
FCOMMON.info.datapath = Pub.setting.SharedDataPath;
FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
//if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
// FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
//using (var dbEnity = new EEEntitiesMain())
//{
// var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("23.01.02.0900")]
[assembly: AssemblyFileVersion("23.01.02.0900")]
[assembly: AssemblyVersion("23.01.03.1055")]
[assembly: AssemblyFileVersion("23.01.03.1055")]

13
Project/fMain.cs
View File

@@ -126,12 +126,13 @@ namespace Project
Func_Login();
if (Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
{
FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
Pub.setting.SharedDataPath = FCOMMON.info.datapath;
Pub.setting.Save();
}
//if (Pub.setting.SharedDataPath.isEmpty() && FCOMMON.info.Login.gcode == "EET1P") //210524
//{
// var datapath = FCOMMON.DBM.getCodeSavlue("55", "01");
// FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
// Pub.setting.SharedDataPath = FCOMMON.info.datapath;
// Pub.setting.Save();
//}
Update_Site();