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 | 143 +++++++++++++++--------------------------------
1 files changed, 46 insertions(+), 97 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/UserController.cs b/WebApi/Gs.Sys/Services/UserController.cs
index 9ccbcd5..e563ab3 100644
--- a/WebApi/Gs.Sys/Services/UserController.cs
+++ b/WebApi/Gs.Sys/Services/UserController.cs
@@ -15,7 +15,6 @@
using Newtonsoft.Json.Linq;
using SqlSugar;
using static Gs.Toolbox.UtilityHelper;
-using SqlDataAdapter = System.Data.SqlClient.SqlDataAdapter;
namespace Gs.Sys.Services;
@@ -25,7 +24,7 @@
public class UserController : Repository<SysUser>, IRomteService
{
private readonly IHttpContextAccessor _http;
- private readonly string _userCode, _userGuid, _orgFids;
+ private readonly string _userCode,_userGuid,_orgFids;
public UserController(IHttpContextAccessor httpContextAccessor)
{
@@ -44,9 +43,8 @@
{
var accountNo = model.accountNo;
var accountPwd = model.accountPwd;
- var accountLog = model.accountLog;
+ string accountLog = model.accountLog;
var _strMsg = "";
- var dd = MD5Encrypt32(accountPwd);
var dset = new DataSet();
dynamic m = new ExpandoObject();
using (var conn = new SqlConnection(DbHelperSQL.strConn))
@@ -62,13 +60,12 @@
new("@outMsg", SqlDbType.NVarChar, 300),
new("@accountNo", accountNo),
new("@accountPwd", MD5Encrypt32(accountPwd)),
- new("@accountLog", accountLog)
+ new("@accountLog",accountLog),
};
parameters[0].Direction = ParameterDirection.Output;
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
- using (var dt =
- new SqlDataAdapter(cmd))
+ using (var dt = new System.Data.SqlClient.SqlDataAdapter(cmd))
{
dt.Fill(dset, "0");
}
@@ -95,7 +92,6 @@
}
}
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, _strMsg);
}
@@ -120,12 +116,11 @@
cmd.CommandType = CommandType.StoredProcedure;
SqlParameter[] parameters =
{
- new("@userGuid", userGuid)
+ new("@userGuid", userGuid),
};
foreach (var parameter in parameters)
cmd.Parameters.Add(parameter);
- using (var dt =
- new SqlDataAdapter(cmd))
+ using (var dt = new System.Data.SqlClient.SqlDataAdapter(cmd))
{
dt.Fill(dset, "0");
}
@@ -158,7 +153,6 @@
}
}
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Exception, "璇诲彇鎴愬姛锛�");
}
@@ -312,8 +306,7 @@
{
m.outOrderGuid = "";
m.outMsg = ex.Message;
- LogHelper.Debug(ToString(),
- "SetUserOrg error锛�" + ex.Message);
+ LogHelper.Debug(ToString(), "SetUserOrg error锛�" + ex.Message);
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Default,
"鎿嶄綔澶辫触锛�");
}
@@ -323,13 +316,10 @@
}
}
}
-
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
}
-
#region
-
/// <summary>
/// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤�
/// </summary>
@@ -345,23 +335,21 @@
var _sbBy =
new StringBuilder(query.sortName + " " + query.sortOrder);
var totalCount = 0;
- var itemsList = Db
- .Queryable<SysUser, MesStaff, SysOrganization>((a, b, org) =>
- new object[]
- {
- JoinType.Left, a.StaffId == b.Id.ToString(),
- JoinType.Left, b.FSubsidiary == org.Fid
- }).Select((a, b, org) => new SysUser
- {
- StaffId = "(" + org.FNumber + ")" + org.Name + " / " +
- b.StaffName,
- IsStatus = a.IsStatus == true ? true : false,
- FlagOnline = a.FlagOnline == true ? true : false
- }, true)
- .Where(_sbWhere.ToString())
- .OrderBy(_sbBy.ToString())
- .ToPageList(query.currentPage, query.everyPageSize,
- ref totalCount);
+ var itemsList = Db.Queryable<SysUser, MesStaff, SysOrganization>((a,b, org) =>
+ new object[]
+ {
+ JoinType.Left, a.StaffId == b.Id.ToString(),
+ JoinType.Left,b.FSubsidiary == org.Fid,
+ }).Select((a, b, org) => new SysUser
+ {
+ StaffId =("(" + org.FNumber + ")" + org.Name)+" / "+b.StaffName,
+ IsStatus = (a.IsStatus == true ? true : false),
+ FlagOnline = (a.FlagOnline == true ? true : false),
+ }, true)
+ .Where(_sbWhere.ToString())
+ .OrderBy(_sbBy.ToString())
+ .ToPageList(query.currentPage, query.everyPageSize,
+ ref totalCount);
pageList = new PageList<SysUser>(itemsList, totalCount,
query.everyPageSize);
return ReturnDto<PageList<SysUser>>.QuickReturn(pageList,
@@ -433,15 +421,14 @@
public ReturnDto<string?> EditModel([FromBody] SysUser model)
{
var cont = 0;
- if (!CheckGuid(model.Guid))
+ if (Gs.Toolbox.UtilityHelper.CheckGuid(model.Guid) == false)
{
cont = base.GetList(it => it.Account == model.Account).Count;
if (cont > 0)
return ReturnDto<string>.QuickReturn(default(string?),
ReturnCode.Exception, "澧炲姞澶辫触锛岃璐﹀彿宸插瓨鍦紒");
}
-
- if (CheckGuid(model.Guid))
+ if (Gs.Toolbox.UtilityHelper.CheckGuid(model.Guid) == true)
{
cont = base.GetList(it => it.Guid == model.Guid && it.IsSys == 1)
.Count;
@@ -449,11 +436,10 @@
return ReturnDto<string>.QuickReturn(default(string?),
ReturnCode.Exception, "鎿嶄綔澶辫触锛屽唴缃处鍙蜂笉鑳借淇敼锛�");
}
-
var _bl = false;
try
{
- if (!CheckGuid(model.Guid))
+ if (Gs.Toolbox.UtilityHelper.CheckGuid(model.Guid) == false)
{
var _password = model.Password;
var strPass = MD5Encrypt32(_password);
@@ -480,15 +466,11 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), "EditModel error锛�" + ex.Message);
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
- ex.Message);
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, ex.Message);
}
-
if (_bl)
- return ReturnDto<string>.QuickReturn(model.Guid.ToString(),
- ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- return ReturnDto<string>.QuickReturn("", ReturnCode.Exception,
- "澧炲姞澶辫触锛岃閲嶈瘯锛�");
+ return ReturnDto<string>.QuickReturn(model.Guid.ToString(), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
+ return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "澧炲姞澶辫触锛岃閲嶈瘯锛�");
}
/// <summary>
@@ -519,28 +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();
- var 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.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 + "'");
+ 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_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 + "'");
try
{
dset = DbHelperSQL.Query(sbSql.ToString());
@@ -555,17 +521,12 @@
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)
{
LogHelper.Debug(ToString(), ex.Message);
}
-
if (m != null)
return ReturnDto<dynamic>.QuickReturn(m, ReturnCode.Success,
"璇诲彇鎴愬姛锛�");
@@ -583,37 +544,28 @@
{
var currentPage = model.currentPage;
var everyPageSize = model.everyPageSize;
- var sortName = string.IsNullOrEmpty(model.sortName)
- ? "a.USER_NAME"
- : model.sortName;
+ var sortName = string.IsNullOrEmpty(model.sortName) ? "a.USER_NAME" : model.sortName;
var keyWhere = model.keyWhere;
- var keyType = model.keyType;
- var sbJoin = new StringBuilder();
+ string keyType = model.keyType;
+ System.Text.StringBuilder sbJoin = new StringBuilder();
sbJoin.Append(" FROM SYS_USER [a] ");
sbJoin.Append(" left join MES_STAFF b on a.STAFF_ID=b.id");
- sbJoin.Append(
- " Left JOIN [SYS_ORGANIZATION] [Org] ON ( [b].[FSubsidiary] = [Org].[FID] )");
+ sbJoin.Append(" Left JOIN [SYS_ORGANIZATION] [Org] ON ( [b].[FSubsidiary] = [Org].[FID] )");
sbJoin.Append(keyWhere);
var sbSql = new StringBuilder();
sbSql.Append(" SELECT * FROM ");
- sbSql.Append(
- " (SELECT N'(' +[Org].[FNumber] + N')' +[Org].[NAME] AS [FSubsidiary2]");
- sbSql.Append(
- ", [a].*,ROW_NUMBER() OVER(ORDER BY a.USER_NAME asc) AS RowIndex ");
+ sbSql.Append(" (SELECT N'(' +[Org].[FNumber] + N')' +[Org].[NAME] AS [FSubsidiary2]");
+ sbSql.Append(", [a].*,ROW_NUMBER() OVER(ORDER BY a.USER_NAME asc) AS RowIndex ");
//濡傛灉鏃犲叧閿瓧锛屾棤闇�鎵炬煡缁戝畾
if (string.IsNullOrEmpty(keyType))
+ {
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);
+ sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" + everyPageSize + " and T.rowindex<=" + currentPage + "*" + everyPageSize);
sbSql.Append(" select count(1) as intTotal ");
sbSql.Append(sbJoin);
var dset = new DataSet();
@@ -624,10 +576,8 @@
catch (Exception ex)
{
LogHelper.Debug(ToString(), "GetListPage error锛�" + ex.Message);
- return ReturnDto<PageList<dynamic>>.QuickReturn(
- default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ return ReturnDto<PageList<dynamic>>.QuickReturn(default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
}
-
var _pglist = new PageList<dynamic>
{
total = 0,
@@ -638,8 +588,7 @@
if (dset != null && dset.Tables.Count > 0 &&
dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
{
- var intTotal =
- int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var intTotal = int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
var pages = intTotal % everyPageSize != 0
? intTotal / everyPageSize + 1
: intTotal / everyPageSize;
@@ -649,10 +598,10 @@
var _dy = dset.Tables[0].TableToDynamicList();
_pglist.list = _dy;
}
-
return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
+
#endregion
}
\ No newline at end of file
--
Gitblit v1.9.3