|
@@ -757,8 +757,6 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
|
|
case EHandlerType.OrgLevel:
|
|
case EHandlerType.OrgLevel:
|
|
//当前操作人所属部门的垂直部门并且属于配置orgLevel的部门
|
|
//当前操作人所属部门的垂直部门并且属于配置orgLevel的部门
|
|
var levels = stepDefine.HandlerTypeItems.Select(d => int.Parse(d.Key)).ToList();
|
|
var levels = stepDefine.HandlerTypeItems.Select(d => int.Parse(d.Key)).ToList();
|
|
- var upLevels = levels.Where(d => d > _sessionContext.OrgLevel);
|
|
|
|
- var lowLevels = levels.Where(d => d < _sessionContext.OrgLevel);
|
|
|
|
// var orgs1 = await _organizeRepository.Queryable()
|
|
// var orgs1 = await _organizeRepository.Queryable()
|
|
// .Where(d => d.IsEnable && levels.Contains(d.Level))
|
|
// .Where(d => d.IsEnable && levels.Contains(d.Level))
|
|
// .WhereIF(!isCenter, d => d.Id.StartsWith(levelOneOrgId))
|
|
// .WhereIF(!isCenter, d => d.Id.StartsWith(levelOneOrgId))
|
|
@@ -775,6 +773,8 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
|
|
+ var upLevels = levels.Where(d => d < _sessionContext.OrgLevel).ToList();
|
|
|
|
+ var lowLevels = levels.Where(d => d > _sessionContext.OrgLevel).ToList();
|
|
orgs1 = await query
|
|
orgs1 = await query
|
|
.Where(d => (upLevels.Contains(d.Level) && d.Id.StartsWith(levelOneOrgId)) ||
|
|
.Where(d => (upLevels.Contains(d.Level) && d.Id.StartsWith(levelOneOrgId)) ||
|
|
(lowLevels.Contains(d.Level) && d.Id.Contains(orgId)))
|
|
(lowLevels.Contains(d.Level) && d.Id.Contains(orgId)))
|