From 1b3db8f5683373dd8e179b006e7314783dd1f9db Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 10 九月 2025 14:42:12 +0800
Subject: [PATCH] 文件补充
---
WebApi/Gs.Sys/Services/UserController.cs | 16 ++--------------
1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/UserController.cs b/WebApi/Gs.Sys/Services/UserController.cs
index 5ccfacc..e563ab3 100644
--- a/WebApi/Gs.Sys/Services/UserController.cs
+++ b/WebApi/Gs.Sys/Services/UserController.cs
@@ -45,7 +45,6 @@
var accountPwd = model.accountPwd;
string accountLog = model.accountLog;
var _strMsg = "";
- string dd = MD5Encrypt32(accountPwd);
var dset = new DataSet();
dynamic m = new ExpandoObject();
using (var conn = new SqlConnection(DbHelperSQL.strConn))
@@ -320,8 +319,6 @@
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
-
-
#region
/// <summary>
/// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤�
@@ -504,17 +501,12 @@
dynamic m = new ExpandoObject();
m.list = new List<dynamic>();
m.list2 = new List<dynamic>();
- m.list3 = new List<dynamic>();
- m.list4= new List<dynamic>();
- m.list5 = new List<dynamic>();
var dset = new DataSet();
System.Text.StringBuilder sbSql = new StringBuilder();
sbSql.Append(" select * from [dbo].[SYS_USER] where guid='" + guid + "'");
sbSql.Append(" select bd.userGuid, bd.guid,pg.PAGE_VIEW as gnName, bd.fType,bd.createBy,bd.createDate from [MES_SYS_PAGEVIEW] pg right join [dbo].[SYS_USER_BIND] bd on(bd.aboutGuid= pg.guid and bd.fType= 'PDA椤甸潰') where bd.fType= 'PDA椤甸潰' and bd.userGuid='" + guid + "' ");
- sbSql.Append(" select bd.userGuid, bd.guid, '銆�' + pg.depot_code + '銆�'+pg.depot_name as gnName, bd.fType,bd.createBy,bd.createDate from [dbo].[MES_DEPOTS] pg right join[dbo].[SYS_USER_BIND] bd on bd.aboutGuid = pg.guid and bd.fType = '浠撳簱' where bd.fType = '浠撳簱' and bd.userGuid='" + guid + "'");
+ sbSql.Append(" select bd.userGuid, bd.guid, pg.depot_name + '(' + pg.depot_code + ')' as gnName, bd.fType,bd.createBy,bd.createDate from [dbo].[MES_DEPOTS] pg right join[dbo].[SYS_USER_BIND] bd on bd.aboutGuid = pg.guid and bd.fType = '浠撳簱' where bd.fType = '浠撳簱' and bd.userGuid='" + guid + "'");
sbSql.Append(" select bd.userGuid, bd.guid,pg.ip as gnName, bd.fType,bd.createBy,bd.createDate from [dbo].[print_info] pg right join [dbo].[SYS_USER_BIND] bd on bd.aboutGuid = pg.guid and bd.fType = '鎵撳嵃鏈�' where bd.fType = '鎵撳嵃鏈�' and bd.userGuid='" + guid + "'");
- sbSql.Append(" select bd.userGuid, bd.guid,'銆�'+pg.line_no+'銆�'+pg.name as gnName, bd.fType,bd.createBy,bd.createDate from MES_WORKSHOP_LINE pg right join [dbo].[SYS_USER_BIND] bd on bd.aboutGuid = pg.guid and bd.fType = '杩囩珯鏃剁粦瀹氱嚎浣�' where bd.fType = '杩囩珯鏃剁粦瀹氱嚎浣�' and bd.userGuid='" + guid + "'");
- sbSql.Append(" select bd.userGuid, bd.guid,'銆�'+pg.FNumber+'銆�'+pg.NAME as gnName, bd.fType,bd.createBy,bd.createDate from SYS_ORGANIZATION pg right join [dbo].[SYS_USER_BIND] bd on cast( bd.aboutGuid as nvarchar(50)) = cast( pg.FID as nvarchar(50)) and bd.fType = '缁勭粐' where bd.fType = '缁勭粐' and bd.userGuid='" + guid + "'");
try
{
dset = DbHelperSQL.Query(sbSql.ToString());
@@ -529,10 +521,6 @@
m.list2 = _tb2;
var _tb3 = dset.Tables[3].TableToDynamicList();
m.list3 = _tb3;
- var _tb4 = dset.Tables[4].TableToDynamicList();
- m.list4 = _tb4;
- var _tb5 = dset.Tables[5].TableToDynamicList();
- m.list5 = _tb5;
}
}
catch (Exception ex)
@@ -574,7 +562,7 @@
sbSql.Append(",cast(0 as bit) as chkInt");
}
else
- sbSql.Append(",cast( (select count(1) from SYS_USER_BIND bind where bind.userGuid='" + keyType + "' and bind.aboutGuid=a.guid and bind.fType='鍛樺伐鍒嗗尯') as bit) as chkInt ");
+ sbSql.Append(",cast( (select count(1) from SYS_USER_BIND b where b.userGuid='" + keyType + "' and b.aboutGuid=a.guid) as bit) as chkInt ");
sbSql.Append(sbJoin);
sbSql.Append(") T");
sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" + everyPageSize + " and T.rowindex<=" + currentPage + "*" + everyPageSize);
--
Gitblit v1.9.3