|
|
@@ -260,12 +260,14 @@ public class SysOrgService : IDynamicApiController, ITransient
|
|
|
var orgIdList = _sysCacheService.Get<List<long>>($"{CacheConst.KeyUserOrg}{userId}"); // 取缓存
|
|
|
if (orgIdList == null || orgIdList.Count < 1)
|
|
|
{
|
|
|
+ // 本人新建机构集合
|
|
|
+ var orgList0 = await _sysOrgRep.AsQueryable().Where(u => u.CreateUserId == userId).Select(u => u.Id).ToListAsync();
|
|
|
// 扩展机构集合
|
|
|
var orgList1 = await _sysUserExtOrgService.GetUserExtOrgList(userId);
|
|
|
// 角色机构集合
|
|
|
var orgList2 = await GetUserRoleOrgIdList(userId);
|
|
|
// 机构并集
|
|
|
- orgIdList = orgList1.Select(u => u.OrgId).Union(orgList2).ToList();
|
|
|
+ orgIdList = orgList1.Select(u => u.OrgId).Union(orgList2).Union(orgList0).ToList();
|
|
|
// 当前所属机构
|
|
|
if (!orgIdList.Contains(_userManager.OrgId))
|
|
|
orgIdList.Add(_userManager.OrgId);
|