Compare commits

..

No commits in common. "7a2580ccde4cf7cd01f8ff62e757e4db47be7fd3" and "5601b839b1151b08a697b537283e29906464bf4b" have entirely different histories.

View File

@ -276,26 +276,6 @@ 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)
{ {
@ -925,7 +905,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);
}); });