wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:c62a4f09bd554a7a9310c11026171bda8b2c3516
Branches Tags
wyw:master
...
compare: wyw:f2a7c1b8816cf03ce7046f06f663719acf186c03
Branches Tags
wyw:master

2 Commits
c62a4f09bd ... f2a7c1b881

Author SHA1 Message Date
wyw
f2a7c1b881 Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe 2025-12-19 11:13:45 +08:00
wyw
26cdd214ba 总部用户列表获取 2025-12-19 11:13:20 +08:00
1 changed files with 19 additions and 9 deletions
Show Stats Expand all files Collapse all files

28
APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
View File

@ -280,24 +280,34 @@ namespace APT.FM.WebApi.Controllers.Api.FM
List<Guid> listDepIDs = new List<Guid>();
if (this.Request.Headers.ContainsKey("Datarule"))
{
string strDeps = this.Request.Headers["Datarule"].ToString();
if (strDeps.Length > 0)
string telnetCode = Request.Headers["Tenant"];
Guid? ORGID = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
if (ORGID.HasValue && ORGID.Value.ToString().StartsWith(telnetCode))
{
string[] arry = strDeps.Split(",");
foreach (var item in arry)
string strDeps = this.Request.Headers["Datarule"].ToString();
if (strDeps.Length > 0)
{
try
string[] arry = strDeps.Split(",");
foreach (var item in arry)
{
listDepIDs.Add(new Guid(item));
try
{
listDepIDs.Add(new Guid(item));
}
catch { }
}
catch { }
}
express = express.And(e => e.DEPARTMENT_ID.HasValue && listDepIDs.Contains(e.DEPARTMENT_ID.Value));
}
else
{
}
express = express.And(e => e.DEPARTMENT_ID.HasValue && listDepIDs.Contains(e.DEPARTMENT_ID.Value));
}
var result = this.WitOrderPaged(express, pageFilter);
if (result.Data.Count() > 0)
if (result.Data != null && result.Data.Count() > 0)
{
var userIds = result.Data.Select(t => t.ID).ToList();
var signs = this.GetEntities<T_FM_USER_SIGN_FILE>(t => userIds.Contains(t.USER_ID), new BaseFilter(pageFilter.OrgId));