tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
Chen Lily
2024-03-26 15:56:31 +08:00
parent 634e8b71ab
commit 0855ae42cd
547 changed files with 94818 additions and 60463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IronIntelContractorSiteLib/Security/CurfewBasePage.cs
View File

@ -168,7 +168,7 @@ namespace IronIntel.Contractor.Site.Security
UserInfo[] items = null;
if (GetCurrentLoginSession() != null)
{
items = UserManagement.GetUsers();
items = UserManagement.GetUsers(string.Empty, string.Empty, GetLanguageCookie());
}
else
{

2
IronIntelContractorSiteLib/Security/JobsiteLimitBasepage.cs
View File

@ -191,7 +191,7 @@ namespace IronIntel.Contractor.Site.Security
if (session != null)
{
//contact = ContactManagement.GetContacts();
users = UserManagement.GetActiveUsers(session.SessionID);
users = UserManagement.GetActiveUsers(GetLanguageCookie(),session.SessionID);
users = users.OrderBy(u => u.DisplayName).ToArray();
}
else

2
IronIntelContractorSiteLib/Security/SecurityBasePage.cs
View File

@ -48,7 +48,7 @@ namespace IronIntel.Contractor.Site.Security
list.Remove(item);
}
if (user.UserType != UserTypes.SupperAdmin)
if (user.UserType != UserTypes.SupperAdmin || IronIntel.Contractor.SystemParams.IsDealer)
{
SecurityNavigateItem item = list.FirstOrDefault(m => m.ID == "nav_curfewmt");
if (item != null)

2
IronIntelContractorSiteLib/Security/UserGroupBasePage.cs
View File

@ -92,7 +92,7 @@ namespace IronIntel.Contractor.Site.Security
// 返回带 Users 数据的详细用户组对象
group = UserManagement.GetGroup(guid.ToString());
}
var users = UserManagement.GetUsers().OrderBy(u => u.ID).ToArray();
var users = UserManagement.GetUsers(string.Empty, string.Empty, GetLanguageCookie()).OrderBy(u => u.ID).ToArray();
return new GroupDetail
{

2
IronIntelContractorSiteLib/Security/UserToContractorPage.cs
View File

@ -56,7 +56,7 @@ namespace IronIntel.Contractor.Site.Security
private void GetUsers()
{
string json = "";
var users = UserManagement.GetUnmanagementUsers().OrderBy(u => u.DisplayName).ToArray();
var users = UserManagement.GetUnmanagementUsers(GetLanguageCookie()).OrderBy(u => u.DisplayName).ToArray();
json = JsonConvert.SerializeObject(users);
Response.Write(json);
Response.End();