From 8bfaf7141c88f41d3dbd1995cfb9cb015ca0d1d6 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 02 八月 2024 16:34:13 +0800
Subject: [PATCH] 整理了工序传入传出参数

---
 Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs b/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
index 9c0263f..94dcb23 100644
--- a/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
+++ b/Tiger.Business/SYS/Biz.SYS_BS_LOGIN.cs
@@ -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,
@@ -176,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
@@ -185,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(() =>
                 {

--
Gitblit v1.9.3