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-11-24 18:07:03 +08:00
commit b58d616897
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -276,6 +276,26 @@ namespace APT.FM.WebApi.Controllers.Api.FM
else else
express = express.And(e => !e.PROJECT_ID.HasValue); express = express.And(e => !e.PROJECT_ID.HasValue);
} }
List<Guid> listDepIDs = new List<Guid>();
if (this.Request.Headers.ContainsKey("Datarule"))
{
string strDeps = this.Request.Headers["Datarule"].ToString();
if (strDeps.Length > 0)
{
string[] arry = strDeps.Split(",");
foreach (var item in arry)
{
try
{
listDepIDs.Add(new Guid(item));
}
catch { }
}
}
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.Count() > 0)
{ {
@ -905,7 +925,7 @@ namespace APT.FM.WebApi.Controllers.Api.FM
var enumValues = new List<string>(); var enumValues = new List<string>();
productionUnit.ForEach(t => productionUnit.ForEach(t =>
{ {
t.USER_ID = entity.ID; t.Nav_Enums = null;t.Nav_Unit = null; t.USER_ID = entity.ID; t.Nav_Enums = null; t.Nav_Unit = null;
var value = enumList.FirstOrDefault(m => m.ID == t.ENUMS_ID)?.VALUE.ToString(); var value = enumList.FirstOrDefault(m => m.ID == t.ENUMS_ID)?.VALUE.ToString();
enumValues.Add(value); enumValues.Add(value);
}); });