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:
wyw 2026-05-21 17:14:39 +08:00
commit 3a9f49ee5c
14 changed files with 162 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB.cs
View File

@ -13,7 +13,7 @@ using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("关键许可工作表")]
[DataRuleField("DEPARTMENT_ID")]
[DataRuleField("Nav_ApplyUser.DEPARTMENT_ID")]
public class T_FO_CRUCIAL_LICENSE_JOB : MesEntityBase
{
[Description("编号")]

2
APT.MS.Domain/Entities/FO/T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE.cs
View File

@ -13,7 +13,7 @@ using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("关键许可工作表")]
[DataRuleField("DEPARTMENT_ID")]
[DataRuleField("Nav_ApplyUser.DEPARTMENT_ID")]
public class T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE : MesEntityBase
{
[Description("编号")]

2
APT.MS.Domain/Entities/FO/T_FO_JOB_EVENT_RECORD.cs
View File

@ -10,7 +10,7 @@ using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("作业活动记录表")]
[DataRuleField("DEPARTMENT_ID")]
[DataRuleField("Nav_CreateUser.DEPARTMENT_ID")]
public class T_FO_JOB_EVENT_RECORD : MesEntityBase
{
[Description("编号")]

2
APT.MS.Domain/Entities/FO/T_FO_TECH_DISCLOSURE_FROM.cs
View File

@ -11,7 +11,7 @@ using System.Text;
namespace APT.MS.Domain.Entities.FO
{
[Description("技术交底表")]
[DataRuleField("DEPARTMENT_ID")]
[DataRuleField("Nav_DisclosurePerson.DEPARTMENT_ID")]
public class T_FO_TECH_DISCLOSURE_FROM : MesEntityBase
{
[Description("编号")]

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

@ -228,7 +228,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
pageFilter.IgnoreDataRule = true;
//pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_PreUsers");
pageFilter.Include.Add("Nav_AfterUsers");
pageFilter.Include.Add("Nav_Team");
@ -239,20 +239,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
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;
{
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// 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())
{
foreach (var entity in result.Data)

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

@ -1763,20 +1763,25 @@ namespace APT.FO.WebApi.Controllers
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
{
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
// if (departmentIds != null && departmentIds.Any())
// {
// result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
// }
// else
// result.Data = null;
//}
if (result.Data.Any())
{
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();

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

@ -1068,20 +1068,25 @@ namespace APT.FO.WebApi.Controllers
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
{
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
// if (departmentIds != null && departmentIds.Any())
// {
// result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(t => t.Nav_ApplyUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_ApplyUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
// }
// else
// result.Data = null;
//}
if (result.Data.Any())
{
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();

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

@ -615,7 +615,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_FO_CURRENT_CLASS_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter)
{
pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Team");
var result = new PagedActionResult<T_FO_CURRENT_CLASS_RECORD>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
@ -626,20 +625,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
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;
}
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// 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;
//}
return result;
}
}

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

@ -797,20 +797,25 @@ namespace APT.FO.WebApi.Controllers
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
{
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
// if (departmentIds != null && departmentIds.Any())
// {
// result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
// }
// else
// result.Data = null;
//}
if (result.Data.Any())
{
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();

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

@ -755,7 +755,7 @@ namespace APT.FO.WebApi.Controllers
pageFilter.Include.Add("Nav_JobEventPerson.Nav_User");
pageFilter.SelectField.Add("Nav_JobEventPerson.USER_ID");
pageFilter.SelectField.Add("Nav_JobEventPerson.Nav_User.NAME");
pageFilter.IgnoreDataRule = true;
//pageFilter.IgnoreDataRule = true;
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
@ -764,20 +764,25 @@ namespace APT.FO.WebApi.Controllers
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
{
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
// if (departmentIds != null && departmentIds.Any())
// {
// result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
// }
// else
// result.Data = null;
//}
if (result.Data.Any())
{
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();

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

@ -872,7 +872,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
[HttpPost, Route("OrderPaged")]
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_Users.Nav_User");
var result = new PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD>();
@ -889,21 +889,26 @@ namespace APT.FO.WebApi.Controllers.Api.FO
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
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;
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// 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;
}
}

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

@ -255,7 +255,7 @@ namespace APT.FO.WebApi.Controllers.Api.FO
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_FO_TEAM_ACTIVITY> OrderPaged([FromBody] KeywordPageFilter pageFilter)
{
pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Taem");
var result = new PagedActionResult<T_FO_TEAM_ACTIVITY>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
@ -265,21 +265,26 @@ namespace APT.FO.WebApi.Controllers.Api.FO
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 ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter);
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
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;
}
{
pageFilter.IgnoreDataRule = true;
}
else
{
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// 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;
}

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

@ -416,6 +416,7 @@ namespace APT.FO.WebApi.Controllers
{
record.CREATER_ID = tech.Nav_JobName.MONITOR_USER_ID;
var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.Nav_JobName.MONITOR_USER_ID);
record.DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
//发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, tech.ORG_ID.Value, DateTime.Now, null, null);
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("关键/许可作业活动记录表单(" + tech?.Nav_JobName?.JOB_DATE.Value.ToShortDateString().Replace("/", "") + ")", record.ID, record.ORG_ID, userInfo.ID, userInfo.NAME, DateTime.Now,
@ -652,6 +653,7 @@ namespace APT.FO.WebApi.Controllers
{
record.CREATER_ID = tech.Nav_JobName.MONITOR_USER_ID;
var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.Nav_JobName.MONITOR_USER_ID);
record.DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
//发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, orgId.Value, DateTime.Now, null, null);
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("作业活动记录表单(关键/许可作业)", record.ID, record.ORG_ID, userInfo.ID, userInfo.NAME, DateTime.Now,
@ -723,6 +725,7 @@ namespace APT.FO.WebApi.Controllers
{
record.CREATER_ID = tech.Nav_JobNameOut.MONITOR_USER_ID;
var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == tech.Nav_JobNameOut.MONITOR_USER_ID);
record.DEPARTMENT_ID = userInfo.DEPARTMENT_ID;
//发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, orgId.Value, DateTime.Now, null, null);
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("作业活动记录表单外包(关键/许可作业)", record.ID, record.ORG_ID, userInfo.ID, userInfo.NAME, DateTime.Now,
@ -792,20 +795,25 @@ namespace APT.FO.WebApi.Controllers
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{
result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter);
pageFilter.IgnoreDataRule = true;
}
else
{
List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(t => (t.Nav_DisclosurePerson != null && departmentIds.Contains(t.Nav_DisclosurePerson.DEPARTMENT_ID.Value)), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
}
{
pageFilter.IgnoreDataRule = false;
}
result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter);
//else
//{
// List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
// List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
// DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
// if (departmentIds != null && departmentIds.Any())
// {
// result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(t => (t.Nav_DisclosurePerson != null && departmentIds.Contains(t.Nav_DisclosurePerson.DEPARTMENT_ID.Value)), pageFilter);//|| dataIds.Contains(t.ID)
// }
// else
// result.Data = null;
//}
return result;
}
}

1
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskEvaluationController.cs
View File

@ -136,6 +136,7 @@ namespace APT.SK.WebApi.Controllers.Api
de.SCOREL_ID = item.SCOREL_ID;
de.SCOREE_ID = item.SCOREE_ID;
de.SCOREC_ID = item.SCOREC_ID;
de.EVALUATE_SCORE = item.EVALUATE_SCORE;
if (item.SCOREL_ID == null || item.SCOREE_ID == null || item.SCOREC_ID == null)
{
throw new Exception("第" + item.NUM + "行，LEC都不能为空");