From 5ce3359d2b01c1ecb635d955ac599bc0b525897a Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 19 六月 2024 17:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs | 3 ++-
Tiger.IBusiness/Common/ILogin.cs | 2 +-
Tiger.Api/Controllers/Base/LoginController.cs | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Tiger.Api/Controllers/Base/LoginController.cs b/Tiger.Api/Controllers/Base/LoginController.cs
index fae1345..0344310 100644
--- a/Tiger.Api/Controllers/Base/LoginController.cs
+++ b/Tiger.Api/Controllers/Base/LoginController.cs
@@ -33,9 +33,9 @@
/// <param name="action"></param>
/// <returns></returns>
[HttpGet]
- public async Task<IActionResult> SwitchOrgCode(string token, string org)
+ public async Task<IActionResult> SwitchOrgCode(string token, string org, string fty)
{
- return Ok(await DI.Resolve<ILogin>().SwitchOrgCode(token,org));
+ return Ok(await DI.Resolve<ILogin>().SwitchOrgCode(token,org, fty));
}
/// <summary>
/// 鑾峰彇鐧诲綍淇℃伅
diff --git a/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs b/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
index 03d498d..94dcb23 100644
--- a/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
+++ b/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
@@ -175,7 +175,7 @@
/// <param name="action"></param>
/// <param name="Async"></param>
/// <returns></returns>
- public async Task<ApiAction> SwitchOrgCode(string token,string org)
+ public async Task<ApiAction> SwitchOrgCode(string token,string org, string fty)
{
var action = new ApiAction();
try
@@ -184,6 +184,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(() =>
{
diff --git a/Tiger.IBusiness/Common/ILogin.cs b/Tiger.IBusiness/Common/ILogin.cs
index 2814c0b..2f16b02 100644
--- a/Tiger.IBusiness/Common/ILogin.cs
+++ b/Tiger.IBusiness/Common/ILogin.cs
@@ -40,7 +40,7 @@
/// <param name="action"></param>
/// <param name="Async"></param>
/// <returns></returns>
- public Task<ApiAction> SwitchOrgCode(string token, string org);
+ public Task<ApiAction> SwitchOrgCode(string token, string org, string fty);
/// <summary>
/// 娉ㄩ攢
--
Gitblit v1.9.3