From fd8a1399090dd3a57b557a7c8d270362397bc21f Mon Sep 17 00:00:00 2001 From: kyy <3283105747@qq.com> Date: 星期六, 20 九月 2025 16:45:04 +0800 Subject: [PATCH] 报工修改 --- service/base/LoginService.cs | 50 ++++++++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 24 deletions(-) diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs index d671f46..5314f17 100644 --- a/service/base/LoginService.cs +++ b/service/base/LoginService.cs @@ -3,6 +3,7 @@ using NewPdaSqlServer.entity; using NewPdaSqlServer.util; using SqlSugar; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory; namespace NewPdaSqlServer.service.@base; @@ -10,27 +11,27 @@ { public dynamic login(string name, string pwd) { + var strPass = UtilityHelper.MD5Encrypt32(pwd); //var sysUser = Db.Queryable<SysUser>() // .Where(s => s.Account == name // && s.Password == strPass).First(); + + var parameters = new[] { - new SugarParameter("@pi_account", name), - new SugarParameter("@pi_password", strPass), - new SugarParameter("@inP1", null), - new SugarParameter("@inP2", null), - new SugarParameter("@inP3", null) - }; + new SugarParameter("@pi_account", name), + new SugarParameter("@pi_password", strPass), + new SugarParameter("@inP1", null), + new SugarParameter("@inP2", null), + new SugarParameter("@inP3", null) + }; try { - var sysUser = Db.Ado - .SqlQuery<dynamic>( - "EXEC prc_pda_login_selUserOrgInfo @pi_account,@pi_password,@inP1,@inP2,@inP3", - parameters).First(); + var sysUser = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_login_selUserOrgInfo @pi_account,@pi_password,@inP1,@inP2,@inP3", parameters).First(); if (sysUser == null) throw new Exception("鐢ㄦ埛涓嶅瓨鍦�"); @@ -43,6 +44,7 @@ // 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫 throw new Exception($"{ex.Message}"); } + } public List<dynamic> getUserMenu(string name) @@ -51,13 +53,13 @@ if ("admin".Equals(name)) { pageViewList = Db.Queryable<MesSysPageview>() - .Where(s => s.PageStatus == true) - .OrderBy(s => s.PageIdx) - .ToList(); + .Where(s => s.PageStatus == true) + .OrderBy(s => s.PageIdx) + .ToList(); } else { - var sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A + string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A LEFT JOIN SYS_USER_BIND B ON CAST(A.guid AS VARCHAR(100)) = B.aboutGuid LEFT JOIN SYS_USER C ON C.GUID = B.userGuid WHERE C.ACCOUNT = '{0}'", name); @@ -113,8 +115,9 @@ } return result; + } - catch (Exception e) + catch(Exception e) { throw new Exception(e.Message); } @@ -134,6 +137,7 @@ public List<dynamic> getUserInfo(string userGuid) { + //string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A // LEFT JOIN SYS_USER_BIND B ON A.guid = B.aboutGuid // LEFT JOIN SYS_USER C ON C.GUID = B.userGuid @@ -147,25 +151,22 @@ public dynamic changeOrg(dynamic query) { - if (query == null) - throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null"); + if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null"); if (string.IsNullOrEmpty(query.userName?.ToString())) throw new ArgumentException("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖", nameof(query.userName)); var parameters = new[] { - new SugarParameter("@pi_account", query.userName), - new SugarParameter("@inP1", null), - new SugarParameter("@inP2", null), - new SugarParameter("@inP3", null) + new SugarParameter("@pi_account", query.userName), + new SugarParameter("@inP1", null), + new SugarParameter("@inP2", null), + new SugarParameter("@inP3", null) }; try { - var orgInfo = Db.Ado.SqlQuery<dynamic>( - "EXEC prc_pda_my_selOrgInfo @pi_account,@inP1,@inP2,@inP3", - parameters); + var orgInfo = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_my_selOrgInfo @pi_account,@inP1,@inP2,@inP3", parameters); //if (sysUser.Count < 1) throw new Exception("鐢ㄦ埛涓嶅瓨鍦ㄥ叧鑱旂粍缁�"); return orgInfo; @@ -175,5 +176,6 @@ // 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫 throw new Exception($"{ex.Message}"); } + } } \ No newline at end of file -- Gitblit v1.9.3