From 0aa54059b26e6641196e9953490dd18616e916e3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 10 九月 2025 17:26:47 +0800
Subject: [PATCH] 精简修正代码

---
 service/base/LoginService.cs |   87 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 70 insertions(+), 17 deletions(-)

diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index 8aabbb9..d671f46 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -2,24 +2,47 @@
 using NewPdaSqlServer.DB;
 using NewPdaSqlServer.entity;
 using NewPdaSqlServer.util;
+using SqlSugar;
 
 namespace NewPdaSqlServer.service.@base;
 
 public class LoginService : RepositoryNoEntity
 {
-    public SysUser login(string name, string pwd)
+    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 sysUser = Db.Queryable<SysUser>()
+        //    .Where(s => s.Account == name
+        //                && s.Password == strPass).First();
 
-        if (sysUser == null) throw new Exception("鐢ㄦ埛涓嶅瓨鍦�");
 
-        var db_password = sysUser.Password;
-        if (!strPass.Equals(db_password)) throw new Exception("鐢ㄦ埛鍚嶆垨鑰呭瘑鐮侀敊璇�");
+        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)
+        };
 
-        return sysUser;
+        try
+        {
+            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("鐢ㄦ埛涓嶅瓨鍦�");
+
+            var db_password = sysUser.Password;
+            if (!strPass.Equals(db_password)) throw new Exception("鐢ㄦ埛鍚嶆垨鑰呭瘑鐮侀敊璇�");
+            return sysUser;
+        }
+        catch (Exception ex)
+        {
+            // 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫
+            throw new Exception($"{ex.Message}");
+        }
     }
 
     public List<dynamic> getUserMenu(string name)
@@ -28,14 +51,14 @@
         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
         {
-            string sql = string.Format(@"SELECT A.* FROM MES_SYS_PAGEVIEW A
-         LEFT JOIN SYS_USER_BIND B ON A.guid = B.aboutGuid
+            var 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);
             pageViewList = Db.Ado.SqlQuery<MesSysPageview>(sql);
@@ -71,7 +94,7 @@
 
                     var icoimg = "";
                     if (mesFile != null)
-                        icoimg = "http://116.148.211.203:81/upload/" +
+                        icoimg = "http://192.168.1.145:81/upload/" +
                                  mesFile.UrlPath;
 
                     groupObj.child.Add(new MesSysPageview
@@ -90,9 +113,8 @@
             }
 
             return result;
-
         }
-        catch(Exception e)
+        catch (Exception e)
         {
             throw new Exception(e.Message);
         }
@@ -112,7 +134,6 @@
 
     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
@@ -123,4 +144,36 @@
         //return sysUser;
         return null;
     }
+
+    public dynamic changeOrg(dynamic query)
+    {
+        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)
+        };
+
+        try
+        {
+            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;
+        }
+        catch (Exception ex)
+        {
+            // 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫
+            throw new Exception($"{ex.Message}");
+        }
+    }
 }
\ No newline at end of file

--
Gitblit v1.9.3