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

优化

Browse Source
This commit is contained in:
何美荣 2026-05-26 11:19:21 +08:00
parent d9448e7976
commit 0d88654fdb
2 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs
View File

@ -268,8 +268,10 @@ namespace APT.FM.WebApi.Controllers.Api
{ {
var result = new PagedActionResult<T_FM_NOTIFICATION_TASK>(); var result = new PagedActionResult<T_FM_NOTIFICATION_TASK>();
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var admiId = this.GetEntity<T_FM_USER>(t => t.CODE == "admin")?.ID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
if (loginUserId == null || loginUserId == admiId) var admiId = this.GetEntity<T_FM_USER>(t => t.CODE == "admin")?.ID;
var depart = this.GetEntity<T_FM_DEPARTMENT>(loginDepartmentId.ToString());
if (loginUserId == null || loginUserId == admiId ||(depart!=null && depart.DEPARTMENT_TYPE == 5))
{ {
DataOrder order2 = new DataOrder(); DataOrder order2 = new DataOrder();
order2.Field = "TASK_STARTDT"; order2.Field = "TASK_STARTDT";
@ -279,10 +281,8 @@ namespace APT.FM.WebApi.Controllers.Api
} }
else else
{ {
var loginDepartmentId = this.GetEntity<T_FM_USER>(loginUserId.ToString())?.DEPARTMENT_ID; if (depart != null)
if (loginDepartmentId != null)
{ {
var depart = this.GetEntity<T_FM_DEPARTMENT>(loginDepartmentId.ToString());
if (depart.DEPARTMENT_TYPE == 20 && depart.USER_ID != loginUserId) if (depart.DEPARTMENT_TYPE == 20 && depart.USER_ID != loginUserId)
{ {
DataOrder order2 = new DataOrder(); DataOrder order2 = new DataOrder();

57
APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
View File

@ -244,6 +244,50 @@ namespace APT.FO.WebApi.Controllers.Api.FO
else else
{ {
pageFilter.IgnoreDataRule = false; pageFilter.IgnoreDataRule = false;
}
var curUser = ""; var changeDept = ""; var changeUser = "";
if (pageFilter != null && pageFilter.FilterGroup != null && pageFilter.FilterGroup.Groups != null)
{
foreach (var item in pageFilter.FilterGroup.Groups)
{
var curUserTemp = item.Rules.FirstOrDefault(t => t.Field == "CURRENT_USER");
if (curUserTemp != null)
{
curUser = curUserTemp.Value.ToString();
item.Rules.Remove(curUserTemp);
}
var changeDeptTemp = item.Rules.FirstOrDefault(t => t.Field == "CHANGE_DEPART");
if (changeDeptTemp != null)
{
changeDept = changeDeptTemp.Value.ToString();
item.Rules.Remove(changeDeptTemp);
}
var changeUserTemp = item.Rules.FirstOrDefault(t => t.Field == "CHANGE_USER");
if (changeUserTemp != null)
{
changeUser = changeUserTemp.Value.ToString();
item.Rules.Remove(changeUserTemp);
}
}
var rules = pageFilter.FilterGroup.Rules.ToList();
foreach (var item in rules)
{
if (item.Field == "CURRENT_USER")
{
curUser = item.Value.ToString();
pageFilter.FilterGroup.Rules.Remove(item);
}
if (item.Field == "CHANGE_DEPART")
{
changeDept = item.Value.ToString();
pageFilter.FilterGroup.Rules.Remove(item);
}
if (item.Field == "CHANGE_USER")
{
changeUser = item.Value.ToString();
pageFilter.FilterGroup.Rules.Remove(item);
}
}
} }
result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter);
//else //else
@ -280,6 +324,19 @@ namespace APT.FO.WebApi.Controllers.Api.FO
} }
} }
} }
if (!string.IsNullOrEmpty(curUser))
{
result.Data = result.Data.Where(t=>t.CURRENT_USER.Contains(curUser)).ToList();
}
if (!string.IsNullOrEmpty(changeDept))
{
result.Data = result.Data.Where(t => t.CHANGE_DEPART.Contains(changeDept)).ToList();
}
if (!string.IsNullOrEmpty(changeUser))
{
result.Data = result.Data.Where(t => t.CHANGE_USER.Contains(changeUser)).ToList();
}
result.TotalCount = result.Data.Count();
} }
return result; return result;
} }