From 05efe0915fedeabfcb412a688f10fa8ff04294f1 Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Thu, 10 Apr 2025 21:30:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=99=BB=E9=8C=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=B7=E7=94=A8=E6=88=B6=E7=8B=80=E6=85=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=9D=9E=E6=AD=A3=E5=B8=B8=E7=8B=80=E6=85=8B=E7=84=A1?=
 =?UTF-8?q?=E6=B3=95=E7=99=BB=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/SYS/AuthController.cs         | 75 ++++++++++++-------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/AMESCoreStudio.WebApi/Controllers/SYS/AuthController.cs b/AMESCoreStudio.WebApi/Controllers/SYS/AuthController.cs
index 0a27add..9f4c618 100644
--- a/AMESCoreStudio.WebApi/Controllers/SYS/AuthController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/SYS/AuthController.cs
@@ -40,44 +40,63 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS
             var account = await _context.UserInfoes.Where(m => m.LoginNo == loginData.LoginNo && m.LoginPassword == loginData.LoginPassword).FirstOrDefaultAsync();
             if (account != null)
             {
-                loginData.UserID = account.UserID;
-
-                var authInfo = new AuthInfo
+                if ((int)account.UserStatusID == 1)
                 {
-                    AuthID = -1,
-                    UserID = account.UserID,
-                    LoginPlatForm = (int)loginData.Platform,
-                    LoginDateTime = DateTime.Now,
-                    LoginIP = loginData.LoginIP.ToString(),
-                };
+                    loginData.UserID = account.UserID;
 
-                int platform = -1;
-                platform = (int)loginData.Platform;
+                    var authInfo = new AuthInfo
+                    {
+                        AuthID = -1,
+                        UserID = account.UserID,
+                        LoginPlatForm = (int)loginData.Platform,
+                        LoginDateTime = DateTime.Now,
+                        LoginIP = loginData.LoginIP.ToString(),
+                    };
 
-                
+                    int platform = -1;
+                    platform = (int)loginData.Platform;
 
-                try
-                {
-                    var auth = await _context.AuthInfo.Where(m => m.UserID == account.UserID && m.LoginPlatForm == platform).FirstOrDefaultAsync();
-                    if (auth != null)
+
+
+                    try
                     {
-                        _context.Entry(auth).State = EntityState.Modified;
-                        auth.LoginDateTime = authInfo.LoginDateTime;
-                        auth.LoginIP = authInfo.LoginIP;
+                        var auth = await _context.AuthInfo.Where(m => m.UserID == account.UserID && m.LoginPlatForm == platform).FirstOrDefaultAsync();
+                        if (auth != null)
+                        {
+                            _context.Entry(auth).State = EntityState.Modified;
+                            auth.LoginDateTime = authInfo.LoginDateTime;
+                            auth.LoginIP = authInfo.LoginIP;
+                        }
+                        else
+                        {
+                            Helper helper = new Helper(_context);
+                            authInfo.AuthID = helper.GetIDKey("AUTH_ID").Result;
+
+                            _context.AuthInfo.Add(authInfo);
+                        }
+
+                        await _context.SaveChangesAsync();
                     }
-                    else
+                    catch (Exception e1)
                     {
-                        Helper helper = new Helper(_context);
-                        authInfo.AuthID = helper.GetIDKey("AUTH_ID").Result;
-
-                        _context.AuthInfo.Add(authInfo);
+                        string msg = e1.Message;
                     }
-
-                    await _context.SaveChangesAsync();
                 }
-                catch (Exception e1)
+                else
                 {
-                    string msg = e1.Message;
+                    switch((int)account.UserStatusID)
+                    {
+                        case 0:
+                            loginData.Msg = "用戶狀態錯誤:未激活";
+                            break;
+                        case 2:
+                            loginData.Msg = "用戶狀態錯誤:禁用";
+                            break;
+                        case 3:
+                            loginData.Msg = "用戶狀態錯誤:注销";
+                            break;
+                    }
+                        
                 }
             }
             else