Merge branch 'master' into features/UserManger

Api/Ewide.Core/Service/Menu/Dto/MenuTreeOutput.cs

@@ -38,6 +38,16 @@ namespace Ewide.Core.Service
         /// </summary>
         public bool VisibleParent { get; set; }
 
+        /// <summary>
+        /// 权限标识
+        /// </summary>
+        public string Permission { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+
         /// <summary>
         /// 排序，越小优先级越高
         /// </summary>

Api/Ewide.Core/Service/Menu/SysMenuService.cs

@@ -138,7 +138,7 @@ namespace Ewide.Core.Service
             var roleIdList = await _sysUserRoleService.GetUserRoleIdList(userId);
             var menuIdList = await _sysRoleMenuService.GetRoleMenuIdList(roleIdList);
             return await _sysMenuRep.DetachedEntities
-                .Where(u => u.VisibleParent)
+                .Where(u => (u.Type == 2 && u.VisibleParent) || u.Type < 2)
                 .Where(u => menuIdList.Contains(u.Id))
                 .Where(u => u.Status == (int)CommonStatus.ENABLE)
                 .Select(u => u.Application).ToListAsync();
@@ -460,6 +460,8 @@ namespace Ewide.Core.Service
                                              Title = u.Name,
                                              Type = u.Type,
                                              VisibleParent = u.VisibleParent,
+                                             Permission = u.Permission,
+                                             Remark = u.Remark,
                                              Sort = u.Sort
                                          }).ToListAsync();
             return new TreeBuildUtil<MenuTreeOutput>().DoTreeBuild(menus);

Api/Ewide.Core/Service/Org/SysOrgService.cs

@@ -330,7 +330,7 @@ namespace Ewide.Core.Service
             // 如果是范围类型是全部数据，则获取当前所有的组织架构Id
             if (dataScopeType == (int)DataScopeType.ALL)
             {
-                orgIdList = await _sysOrgRep.DetachedEntities.Where(u => u.Status != (int)CommonStatus.ENABLE).Select(u => u.Id).ToListAsync();
+                orgIdList = await _sysOrgRep.DetachedEntities.Where(u => u.Status == (int)CommonStatus.ENABLE).Select(u => u.Id).ToListAsync();
             }
             // 如果范围类型是本部门及以下部门，则查询本节点和子节点集合，包含本节点
             else if (dataScopeType == (int)DataScopeType.DEPT_WITH_CHILD)