diff --git a/HKCardManager/UserPages/CarMangerPage.cs b/HKCardManager/UserPages/CarMangerPage.cs index 50449f8..ee7d1fa 100644 --- a/HKCardManager/UserPages/CarMangerPage.cs +++ b/HKCardManager/UserPages/CarMangerPage.cs @@ -503,15 +503,15 @@ namespace HKCardManager.UserPages MessageLogNotify.GetInstance.Show("请放入卡片"); return; } - SqlLogic.AddAmin(CardNo); - HKLibHelper.AddUserSync(new UserDto - { - Name = "管理员", - CardNo = CardNo, - OrgId = sid, - Num = HKLibHelper.GetUserMaxNumSync() - }); - UHFCardHelper.GetInstance().WriteCard(CardNo); + //SqlLogic.AddAmin(CardNo); + //HKLibHelper.AddUserSync(new UserDto + //{ + // Name = "管理员", + // CardNo = CardNo, + // OrgId = sid, + // Num = HKLibHelper.GetUserMaxNumSync() + //}); + var rr= UHFCardHelper.GetInstance().WriteCard(CardNo); this.Invoke(() => { textBox1.Text = CardNo; diff --git a/HKCardManager/options.pro.json b/HKCardManager/options.pro.json index f4559d3..c9e3221 100644 --- a/HKCardManager/options.pro.json +++ b/HKCardManager/options.pro.json @@ -9,5 +9,5 @@ //"MQ": "host=10.2.1.43:15672;username=username;password=pwd" //MQ正式地址 "MQ": "host=47.108.65.220;username=root;password=pwd", - "Admin": [ 666, 888, 999 ] + "Admin": [6666666666666666666, 8888888888888888888, 9999999999999999999 ] } diff --git a/HKCardOUT/options.pro.json b/HKCardOUT/options.pro.json index 81ad0e4..fbedded 100644 --- a/HKCardOUT/options.pro.json +++ b/HKCardOUT/options.pro.json @@ -25,7 +25,7 @@ //MQ正式地址 "MQ": "host=47.108.65.220;username=root;password=pwd", //超级卡 - "Admin": [], + "Admin": [ 6666666666666666666, 8888888888888888888, 9999999999999999999 ], //刷卡间隔 "Span": 5 } diff --git a/HKLib/Interfaces/HKLibHelper.cs b/HKLib/Interfaces/HKLibHelper.cs index 4082531..afed4f3 100644 --- a/HKLib/Interfaces/HKLibHelper.cs +++ b/HKLib/Interfaces/HKLibHelper.cs @@ -131,7 +131,7 @@ namespace HKLib.Interfaces }).Build().RunStringFirstAsync(); if (data.IsNullOrEmpty()) return new List(); var model = data.ToModel()["data"]["data"].ToJson().ToModel>(); - return model.Where(t => !t.Name.IsNullOrEmpty()).Where(t => !t.Name.Contains("管理员")).Select(t => new OrgDto + return model.Where(t => !t.Name.IsNullOrEmpty()).Select(t => new OrgDto { Name = t.Name, SId = t.Id @@ -194,7 +194,7 @@ namespace HKLib.Interfaces if (string.IsNullOrEmpty(data)) return new List(); var res = data.ToModel()["data"]["data"].ToJson().ToModel>(); - return res.Where(t=>!string.IsNullOrEmpty(t.Name)).Where(t=>!t.Name.Contains("管理员")).OrderByDescending(t=>t.Num).ToList(); + return res.Where(t=>!string.IsNullOrEmpty(t.Name)).OrderByDescending(t=>t.Num).ToList(); } public static List GetUserListSync(string keyword)