cdl/HTCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级.net8

Browse Source
This commit is contained in:
dell
2024-11-14 09:01:55 +08:00
parent 48e9e27fa0
commit abf72c3d58
86 changed files with 14229 additions and 10612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
HT.Cloud.Web/Areas/SystemOrganize/Controllers/UserController.cs
View File

@ -70,32 +70,6 @@ namespace HT.Cloud.Web.Areas.SystemOrganize.Controllers
public async Task<ActionResult> GetFormJson(string keyValue)
{
var data = await _service.GetLookForm(keyValue);
if (!string.IsNullOrEmpty(data.F_OrganizeId))
{
List<string> str = new List<string>();
foreach (var item in data.F_OrganizeId.Split(','))
{
var temp = await _orgService.GetForm(item);
if (temp != null)
{
str.Add(temp.F_FullName);
}
}
data.F_OrganizeName = string.Join(" ", str.ToArray());
}
if (!string.IsNullOrEmpty(data.F_RoleId))
{
List<string> str = new List<string>();
foreach (var item in data.F_RoleId.Split(','))
{
var temp = await _roleService.GetForm(item);
if (temp != null)
{
str.Add(temp.F_FullName);
}
}
data.F_RoleName = string.Join(" ", str.ToArray());
}
return Content(data.ToJson());
}
@ -104,32 +78,6 @@ namespace HT.Cloud.Web.Areas.SystemOrganize.Controllers
public async Task<ActionResult> GetUserFormJson()
{
var data = await _service.GetFormExtend(_service.currentuser.UserId);
if (!string.IsNullOrEmpty(data.F_OrganizeId))
{
List<string> str = new List<string>();
foreach (var item in data.F_OrganizeId.Split(','))
{
var temp = await _orgService.GetForm(item);
if (temp != null)
{
str.Add(temp.F_FullName);
}
}
data.F_OrganizeName = string.Join(" ", str.ToArray());
}
if (!string.IsNullOrEmpty(data.F_RoleId))
{
List<string> str = new List<string>();
foreach (var item in data.F_RoleId.Split(','))
{
var temp = await _roleService.GetForm(item);
if (temp != null)
{
str.Add(temp.F_FullName);
}
}
data.F_RoleName = string.Join(" ", str.ToArray());
}
return Content(data.ToJson("yyyy-MM-dd"));
}