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-01-14 18:06:00 +08:00
parent bfa5894be2
commit 2434bb4df6
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -1803,15 +1803,16 @@ namespace APT.SK.WebApi.Controllers.Api
{
var loginDepart = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var posts = this.GetEntities<T_FM_USER_POST>(t => t.IS_DELETED == false, new BaseFilter(filter.OrgId));
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(filter.OrgId));
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
var AHDepart = departs.FirstOrDefault(t => t.ID == loginDepart);
if (AHDepart != null && (AHDepart.DEPARTMENT_TYPE == 5 || AHDepart.DEPARTMENT_TYPE == 2))
{
loginDepart = departs.FirstOrDefault(t => t.PARENT_ID == null).ID;
}
List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
//if (AHDepart != null && (AHDepart.DEPARTMENT_TYPE == 5 || AHDepart.DEPARTMENT_TYPE == 2))
//{
// loginDepart = departs.FirstOrDefault(t => t.PARENT_ID == null).ID;
//}
//List<Guid> departmentIds = new List<Guid>() { loginDepart.Value };
//DepartmentService.GetDepartmentIds(filter.OrgId.Value, new List<Guid>() { loginDepart.Value }, ref departmentIds);
List<Guid> departmentIds = departs.Select(t => t.ID).ToList();
var checkList = new JsonActionResult<List<T_SK_ENTERPRISE_LIBRARY_POST>>();
List<T_SK_ENTERPRISE_LIBRARY_POST> postLists = new List<T_SK_ENTERPRISE_LIBRARY_POST>();
var detailContents = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.DEPARTMENT_ID != null && departmentIds.Contains((Guid)t.DEPARTMENT_ID), new BaseFilter(filter.OrgId), "Nav_Library.Nav_ProductionUnit", "Nav_PostDetails", "Nav_Department");
@ -2706,14 +2707,14 @@ namespace APT.SK.WebApi.Controllers.Api
}
list.Add(listNew);
}
if (userInfoTemp != null && userInfoTemp.Nav_Department!=null && (userInfoTemp.NAME.Contains("管理员") || userInfoTemp.Nav_Department.DEPARTMENT_STATUS == 2 || userInfoTemp.Nav_Department.DEPARTMENT_TYPE == 5))
//if (userInfoTemp != null && userInfoTemp.Nav_Department!=null && (userInfoTemp.NAME.Contains("管理员") || userInfoTemp.Nav_Department.DEPARTMENT_STATUS == 2 || userInfoTemp.Nav_Department.DEPARTMENT_TYPE == 5))
{
checkList.Data = list.OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
}
else
{
checkList.Data = list.Where(t => t.PRODUCTION_UNIT_ID != null && selectMinetype.Contains((Guid)t.PRODUCTION_UNIT_ID)).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
}
//else
//{
// checkList.Data = list.Where(t => t.PRODUCTION_UNIT_ID != null && selectMinetype.Contains((Guid)t.PRODUCTION_UNIT_ID)).OrderBy(n => n.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
//}
checkList.TotalCount = checkList.Data.Count;
}
return checkList;