工作票作业区域显示
This commit is contained in:
parent
f8f0b7563a
commit
d2c825b525
@ -85,7 +85,7 @@ namespace APT.FO.WebApi.Controllers
|
|||||||
if (string.IsNullOrEmpty(id))
|
if (string.IsNullOrEmpty(id))
|
||||||
this.ThrowError("060010");
|
this.ThrowError("060010");
|
||||||
var result = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id, new string[] { "Nav_CrucialLicensePerson", "Nav_CrucialLicensePerson.Nav_User","Nav_Files.Nav_ImgFile",
|
var result = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id, new string[] { "Nav_CrucialLicensePerson", "Nav_CrucialLicensePerson.Nav_User","Nav_Files.Nav_ImgFile",
|
||||||
"Nav_CrucialLicensePerson.Nav_User.Nav_Department","Nav_OperationStep","Nav_ApplyUser","Nav_MonitorUser","Nav_JobScheme","Nav_Risks",
|
"Nav_CrucialLicensePerson.Nav_User.Nav_Department","Nav_OperationStep","Nav_ApplyUser","Nav_MonitorUser","Nav_JobScheme","Nav_Risks","Nav_Area",
|
||||||
"Nav_JobScheme.Nav_PreOperSchFile","Nav_JobScheme.Nav_PreOperSchFile.Nav_ImgFile","Nav_JobScheme.Nav_PreOperSchFile.Nav_ImgFile"});
|
"Nav_JobScheme.Nav_PreOperSchFile","Nav_JobScheme.Nav_PreOperSchFile.Nav_ImgFile","Nav_JobScheme.Nav_PreOperSchFile.Nav_ImgFile"});
|
||||||
if (result != null)
|
if (result != null)
|
||||||
{
|
{
|
||||||
@ -161,7 +161,7 @@ namespace APT.FO.WebApi.Controllers
|
|||||||
// "Nav_JobScheme.Nav_PreOperSchFile.Nav_ImgFile", "Nav_CrucialLicensePerson.Nav_User" };
|
// "Nav_JobScheme.Nav_PreOperSchFile.Nav_ImgFile", "Nav_CrucialLicensePerson.Nav_User" };
|
||||||
//var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id);
|
//var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id);
|
||||||
var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id,
|
var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id,
|
||||||
"Nav_OperationStep", "Nav_ApplyUser", "Nav_MonitorUser", "Nav_Files.Nav_ImgFile", "Nav_Department", "Nav_Risks");
|
"Nav_OperationStep", "Nav_ApplyUser", "Nav_MonitorUser", "Nav_Files.Nav_ImgFile", "Nav_Department", "Nav_Risks", "Nav_Area");
|
||||||
if (entity != null)
|
if (entity != null)
|
||||||
{
|
{
|
||||||
var newFilter = new BaseFilter(filter.OrgId);
|
var newFilter = new BaseFilter(filter.OrgId);
|
||||||
|
|||||||
@ -56,7 +56,7 @@ namespace APT.FO.WebApi.Controllers
|
|||||||
if (string.IsNullOrEmpty(id))
|
if (string.IsNullOrEmpty(id))
|
||||||
this.ThrowError("060010");
|
this.ThrowError("060010");
|
||||||
var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(id,
|
var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(id,
|
||||||
"Nav_OperationStep", "Nav_ApplyUser", "Nav_MonitorUser", "Nav_Related", "Nav_Department","Nav_Risks");
|
"Nav_OperationStep", "Nav_ApplyUser", "Nav_MonitorUser", "Nav_Related", "Nav_Department","Nav_Risks", "Nav_Area");
|
||||||
if (entity != null)
|
if (entity != null)
|
||||||
{
|
{
|
||||||
var newFilter = new BaseFilter(filter.OrgId);
|
var newFilter = new BaseFilter(filter.OrgId);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user