2134
This commit is contained in:
parent
2d0ef5be61
commit
80ef98f15c
@ -664,24 +664,21 @@
|
||||
//filter.IgnoreDataRule = true;
|
||||
//result = GetEntity<T_PF_APPROVE>(e => !e.IS_DELETED, filter, null);
|
||||
|
||||
//前端处理Tenant
|
||||
//前端处理了Tenant
|
||||
filter.IgnoreOrgRule = true;
|
||||
filter.OrgId = null;
|
||||
result = GetEntity<T_PF_APPROVE>(e => !e.IS_DELETED, filter, null);
|
||||
}
|
||||
else
|
||||
|
||||
result = GetEntity<T_PF_APPROVE>(null, filter, null);
|
||||
if (result != null)
|
||||
{
|
||||
result = GetEntity<T_PF_APPROVE>(null, filter, null);
|
||||
if (result != null)
|
||||
if (result.APPROVE_TEMP_ID != null)
|
||||
{
|
||||
if (result.APPROVE_TEMP_ID != null)
|
||||
{
|
||||
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.ID == result.APPROVE_TEMP_ID);
|
||||
if (approveTemp != null)
|
||||
result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
|
||||
}
|
||||
result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList();
|
||||
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.ID == result.APPROVE_TEMP_ID);
|
||||
if (approveTemp != null)
|
||||
result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
|
||||
}
|
||||
result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList();
|
||||
}
|
||||
return result;
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user