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-04-24 14:15:24 +08:00
parent a55f60c96f
commit 5ddf7f4206
10 changed files with 104 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,35 +221,30 @@ namespace APT.FO.WebApi.Controllers.Api.FO
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderPaged")] [HttpPost, Route("OrderPaged")]
public PagedActionResult<T_FO_CHANGE_SHIFT_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter) public PagedActionResult<T_FO_CHANGE_SHIFT_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter)
{ {
var result = new PagedActionResult<T_FO_CHANGE_SHIFT_RECORD>(); var result = new PagedActionResult<T_FO_CHANGE_SHIFT_RECORD>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0,new BaseFilter(pageFilter.OrgId), "Nav_ApproveRole"); var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
var admiId = users.FirstOrDefault(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID;
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value;
var tempDeps = GetEntities<T_FM_DEPARTMENT>(t=>t.ENABLE_STATUS == 0,new BaseFilter(pageFilter.OrgId));
var tempDep = tempDeps.FirstOrDefault(t=>t.ID == currDep);
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_PreUsers"); pageFilter.Include.Add("Nav_PreUsers");
pageFilter.Include.Add("Nav_AfterUsers"); pageFilter.Include.Add("Nav_AfterUsers");
pageFilter.Include.Add("Nav_Team"); pageFilter.Include.Add("Nav_Team");
pageFilter.Limit = 10; pageFilter.Limit = 10;
if (tempDep!=null&& tempDep.DEPARTMENT_TYPE == (int)FMDepartmentType.Class) var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_ApproveRole");
{ var tempDeps = GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId));
currDep = (Guid)tempDep.PARENT_ID; var departStatus = tempDeps.FirstOrDefault(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
} var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
var AHDepartment = users.FirstOrDefault(t => t.Nav_ApproveRole != null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment)
{ {
result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter);
} }
else if (tempDep != null && (tempDep.NAME.Contains("安环科") || tempDep.NAME.Contains("安全环保")) && tempDep.PARENT_ID != null) else
{ {
List<Guid> departmentId = new List<Guid>(); List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
departmentId.Add((Guid)tempDep.PARENT_ID); List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { (Guid)tempDep.PARENT_ID };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {
@ -258,20 +253,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
else else
result.Data = null; result.Data = null;
} }
else
{
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)loginDepartmentId);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(t => t.Nav_Team!=null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID), pageFilter);
}
else
result.Data = null;
}
if (result.Data.Any()) if (result.Data.Any())
{ {
foreach (var entity in result.Data) foreach (var entity in result.Data)
@ -279,12 +260,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO
if (entity.Nav_PreUsers != null && entity.Nav_PreUsers.Any()) if (entity.Nav_PreUsers != null && entity.Nav_PreUsers.Any())
{ {
var userTemp = entity.Nav_PreUsers.Select(t => t.USER_ID).ToList(); var userTemp = entity.Nav_PreUsers.Select(t => t.USER_ID).ToList();
var userList = users.Where(t => userTemp.Contains(t.ID)).Select(m=>m.NAME).ToList(); var userList = users.Where(t => userTemp.Contains(t.ID)).Select(m => m.NAME).ToList();
entity.CURRENT_USER = string.Join(",", userList); entity.CURRENT_USER = string.Join(",", userList);
} }
if (entity.Nav_AfterUsers != null && entity.Nav_AfterUsers.Any()) if (entity.Nav_AfterUsers != null && entity.Nav_AfterUsers.Any())
{ {
var user = users.FirstOrDefault(t=>t.ID == entity.Nav_AfterUsers.FirstOrDefault().USER_ID); var user = users.FirstOrDefault(t => t.ID == entity.Nav_AfterUsers.FirstOrDefault().USER_ID);
if (user != null) if (user != null)
{ {
entity.CHANGE_DEPART = tempDeps.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID)?.NAME; entity.CHANGE_DEPART = tempDeps.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID)?.NAME;

9
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -1757,10 +1757,11 @@ namespace APT.FO.WebApi.Controllers
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter);
} }

5
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
View File

@ -1064,8 +1064,9 @@ namespace APT.FO.WebApi.Controllers
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter);
} }

56
APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
View File

@ -612,46 +612,32 @@ namespace APT.FO.WebApi.Controllers.Api.FO
/// </summary> /// </summary>
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderPaged")] [HttpPost, Route("OrderPaged")]
public PagedActionResult<T_FO_CURRENT_CLASS_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter) public PagedActionResult<T_FO_CURRENT_CLASS_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter)
{ {
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Team"); pageFilter.Include.Add("Nav_Team");
var result = new PagedActionResult<T_FO_CURRENT_CLASS_RECORD>(); var result = new PagedActionResult<T_FO_CURRENT_CLASS_RECORD>();
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var admiId = this.GetEntity<T_FM_USER>(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
var AHDepartment = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole!=null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; //安环部负责人departmentID
var departInfo = GetEntity<T_FM_DEPARTMENT>(t => t.ID == currDep && t.ENABLE_STATUS == 0); var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
{ if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter); {
} result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter);
else if (departInfo != null && (departInfo.NAME.Contains("安环科") || departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID != null)
{
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)departInfo.PARENT_ID);
List<Guid> departmentIds = new List<Guid>() { (Guid)departInfo.PARENT_ID };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
} }
else else
{ {
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentId = new List<Guid>(); List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
departmentId.Add((Guid)loginDepartmentId); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId }; if (departmentIds != null && departmentIds.Any())
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); {
if (departmentIds != null && departmentIds.Any()) result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID)
{ }
result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID) else
}
else
result.Data = null; result.Data = null;
} }
return result; return result;

9
APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs
View File

@ -791,10 +791,11 @@ namespace APT.FO.WebApi.Controllers
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter);
} }

13
APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
View File

@ -750,12 +750,13 @@ namespace APT.FO.WebApi.Controllers
var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PARENT_NAME"); var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PARENT_NAME");
if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString())) if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString()))
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User"); result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User");
} }

90
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

@ -780,61 +780,41 @@ namespace APT.FO.WebApi.Controllers.Api.FO
/// <param name="pageFilter">分页过滤实体</param> /// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns> /// <returns></returns>
[HttpPost, Route("OrderPaged")] [HttpPost, Route("OrderPaged")]
public PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter) public PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter)
{ {
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Team"); pageFilter.Include.Add("Nav_Team");
pageFilter.Include.Add("Nav_Users.Nav_User"); pageFilter.Include.Add("Nav_Users.Nav_User");
var result = new PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD>(); var result = new PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD>();
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; Expression<Func<T_FO_PRE_SHIFT_MEETING_RECORD, bool>> express = t => t.IS_DELETED == false;
var admiId = this.GetEntity<T_FM_USER>(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; if (!string.IsNullOrEmpty(pageFilter.Parameter1))
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; {
var AH = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")); express = express.And(t => t.Nav_Users.Any(i => i.Nav_User != null && i.Nav_User.NAME.Contains(pageFilter.Parameter1)));
Guid? AHDepartment = Guid.Empty; }
var departInfo = GetEntity<T_FM_DEPARTMENT>(t => t.ID == currDep && t.ENABLE_STATUS == 0); var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
Expression<Func<T_FO_PRE_SHIFT_MEETING_RECORD, bool>> express = t => t.IS_DELETED==false; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
if (!string.IsNullOrEmpty(pageFilter.Parameter1)) var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
{ //安环部负责人departmentID
express = express.And(t => t.Nav_Users.Any(i =>i.Nav_User!=null && i.Nav_User.NAME.Contains(pageFilter.Parameter1))); var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
} var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (AH != null) if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
AHDepartment = AH.DEPARTMENT_ID; result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);
} }
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) else
{ {
result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter); List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
} List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
else if (departInfo!=null && (departInfo.NAME.Contains("安环科")|| departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID!=null) DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
{ if (departmentIds != null && departmentIds.Any())
List<Guid> departmentId = new List<Guid>(); {
departmentId.Add((Guid)departInfo.PARENT_ID); express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID));
List<Guid> departmentIds = new List<Guid>() { (Guid)departInfo.PARENT_ID }; result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);//|| dataIds.Contains(t.ID)
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); }
if (departmentIds != null && departmentIds.Any()) else
{ result.Data = null;
express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)); }
result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);//|| dataIds.Contains(t.ID) return result;
}
else
result.Data = null;
}
else
{
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)loginDepartmentId);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID));
result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
}
return result;
} }
} }
} }

32
APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
View File

@ -257,20 +257,20 @@ namespace APT.FO.WebApi.Controllers.Api.FO
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Taem"); pageFilter.Include.Add("Nav_Taem");
var result = new PagedActionResult<T_FO_TEAM_ACTIVITY>(); var result = new PagedActionResult<T_FO_TEAM_ACTIVITY>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
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.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; //安环部负责人departmentID
var AHDepartment = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole!=null &&(t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
var departInfo = GetEntity<T_FM_DEPARTMENT>(t => t.ID == currDep && t.ENABLE_STATUS == 0); var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter);
} }
else if (departInfo != null && (departInfo.NAME.Contains("安环科") || departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID != null) else
{ {
List<Guid> departmentId = new List<Guid>(); List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
departmentId.Add((Guid)departInfo.PARENT_ID); List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { (Guid)departInfo.PARENT_ID };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {
@ -279,20 +279,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
else else
result.Data = null; result.Data = null;
} }
else
{
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)loginDepartmentId);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(t => t.Nav_Taem!=null && departmentIds.Contains((Guid)t.Nav_Taem.DEPARTMENT_ID), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
}
return result; return result;
} }
} }

9
APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs
View File

@ -786,10 +786,11 @@ namespace APT.FO.WebApi.Controllers
var result = new PagedActionResult<T_FO_TECH_DISCLOSURE_FROM>(); var result = new PagedActionResult<T_FO_TECH_DISCLOSURE_FROM>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserCode.Contains("admin") || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter);
} }

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs
View File

@ -115,7 +115,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
//发消息 //发消息
var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'); var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0')+")";
if (orgId.ToString() == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913") if (orgId.ToString() == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913")
{ {
titleName = "手动隐患上报完善"; titleName = "手动隐患上报完善";