From 3cab868262d5e84cd1000851c07cce43a459f3ea Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 29 八月 2024 20:49:54 +0800
Subject: [PATCH] 增加CS客户端登录逻辑
---
Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs b/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
index 9c0263f..57eb9f7 100644
--- a/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
+++ b/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
@@ -19,7 +19,7 @@
/// <param name="token"></param>
/// <param name="Async"></param>
/// <returns></returns>
- public async Task<SYS_BS_LOGIN> GetLoginInfo(string token, bool Async = true)
+ public async Task<SYS_BS_LOGIN> GetBSLoginInfo(string token, bool Async = true)
{
SYS_BS_LOGIN query = null;
try
@@ -70,7 +70,7 @@
/// <param name="action"></param>
/// <param name="Async"></param>
/// <returns></returns>
- public async Task<ApiAction<SYS_BS_LOGIN>> Login(ApiAction<UserInfo> action, bool Async = true)
+ public async Task<ApiAction<SYS_BS_LOGIN>> BSLogin(ApiAction<UserInfo> action, bool Async = true)
{
var res = new ApiAction<SYS_BS_LOGIN>();
try
@@ -82,10 +82,9 @@
{
if (user.STATUS_CODE == "ENABLE")
{
- var fty = userInfo.FTY_CODE ?? "QXXC";
MES_FACTORY _factory = Db.Queryable<MES_FACTORY>()
- .Where(x => x.FTY_CODE == fty)
- .ToList()[0];
+ .WhereIF(!userInfo.FTY_CODE.IsNullOrEmpty(),x => x.FTY_CODE == userInfo.FTY_CODE)
+ .First();
SYS_BS_LOGIN logininfo = new SYS_BS_LOGIN
{
@@ -95,8 +94,8 @@
CREATE_TIME = DateTime.Now,
STATUS_CODE = user.STATUS_CODE,
CLIENT_IP = userInfo?.ip,
- FTY_CODE = _factory.FTY_CODE,
- FTY_NAME = _factory.FTY_NAME,
+ FTY_CODE = _factory?.FTY_CODE,
+ FTY_NAME = _factory?.FTY_NAME,
TOKEN = userInfo.Token ?? Guid.NewGuid().ToString("N"),
ID = Guid.NewGuid().ToString("N"),
ACCOUNT_TYPE = 0,
@@ -170,13 +169,14 @@
}
return await Task.FromResult(res);
}
+
/// <summary>
/// 鍒囨崲鎹偣
/// </summary>
/// <param name="action"></param>
/// <param name="Async"></param>
/// <returns></returns>
- public async Task<ApiAction> SwitchOrgCode(string token,string org)
+ public async Task<ApiAction> BSSwitchOrgCode(string token,string org, string fty)
{
var action = new ApiAction();
try
@@ -185,6 +185,7 @@
var query = Db.Queryable<SYS_BS_LOGIN>().Where(x => x.TOKEN == token).First();
query.ORG_CODE = org;
+ query.FTY_CODE = fty;
var db = Business.Biz.Db;
var dbTran = db.UseTran(() =>
{
@@ -209,7 +210,7 @@
/// </summary>
/// <param name="token"></param>
/// <returns></returns>
- public async Task<ApiAction> Logout(string token)
+ public async Task<ApiAction> BSLogout(string token)
{
var res = new ApiAction();
try
--
Gitblit v1.9.3