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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
何美荣 2025-12-19 16:21:55 +08:00
commit 68543a387e
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File 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>(); List<Guid> listDepIDs = new List<Guid>();
if (this.Request.Headers.ContainsKey("Datarule")) if (this.Request.Headers.ContainsKey("Datarule"))
{ {
string strDeps = this.Request.Headers["Datarule"].ToString(); string telnetCode = Request.Headers["Tenant"];
if (strDeps.Length > 0) Guid? ORGID = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
if (ORGID.HasValue && ORGID.Value.ToString().StartsWith(telnetCode))
{ {
string[] arry = strDeps.Split(","); string strDeps = this.Request.Headers["Datarule"].ToString();
foreach (var item in arry) 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); 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 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)); var signs = this.GetEntities<T_FM_USER_SIGN_FILE>(t => userIds.Contains(t.USER_ID), new BaseFilter(pageFilter.OrgId));