From 86a0c62c22b793ebbbc67a5f2b01a9a4800640e2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期日, 31 七月 2022 13:06:58 +0800
Subject: [PATCH] 同一账号有效时间内只允许一人登录

---
 VueWebApi/DLL/DAL/DeviceManagerDAL.cs |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
index 4e5559c..34171f1 100644
--- a/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
+++ b/VueWebApi/DLL/DAL/DeviceManagerDAL.cs
@@ -454,12 +454,13 @@
                 // --------------鏌ヨ鎸囧畾鏁版嵁--------------
                 var total = 0; //鎬绘潯鏁�
                 var sql = @"select A.id,A.code,A.name,A.eqptype_code,B.name as eqptype_name,A.eqpgroup_code,G.name as eqpgroup_name,A.enable,
-                            A.input_date,A.wksp_code,T.org_name as wksp_name,A.Line_code,L.org_name as Line_name,A.opc_uom,A.operation_ration,A.lm_user,A.lm_date
+                            A.input_date,A.wksp_code,T.org_name as wksp_name,A.Line_code,L.org_name as Line_name,A.opc_uom,A.operation_ration,U.username as lm_user,A.lm_date
                             from TEqpInfo A
                             left join TEqpType B on A.eqptype_code=B.code
                             left join TEqpGroup G on A.eqpgroup_code=G.code
                             left join TOrganization T on A.wksp_code=T.org_code
                             left join TOrganization L on A.Line_code=L.org_code
+                            left join TUser U on A.lm_user=U.usercode
                             where A.is_delete<>'1' " + search;
                 var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                 mes.code = "200";

--
Gitblit v1.9.3