update:组织用户目录树全部读取

Api/Ewide.Core/Entity/SysOrg.cs

@@ -1,5 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Xml.Serialization;
 
@@ -29,6 +30,7 @@ namespace Ewide.Core
         /// 名称
         /// </summary>
         [Comment("名称")]
+        [MaxLength(20)]
         public string Name { get; set; }
 
         /// <summary>

Api/Ewide.Core/Service/User/Dto/OrgUserInput.cs

@@ -0,0 +1,6 @@
+namespace Ewide.Core.Service
+{
+    public class OrgUserInput
+    {
+    }
+}

Api/Ewide.Core/Service/User/Dto/OrgUserTreeNode.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Ewide.Core.Service.User.Dto
+{
+    public class OrgUserTreeNode : ITreeNode
+    {
+        public string Id { get; set; }
+        public string ParentId { get; set; }
+        public string Name { get; set; }
+        public int Type { get; set; }
+        public List<OrgUserTreeNode> Children { get; set; }
+        public string GetId() => Id;
+        public string GetPid() => ParentId;
+        public void SetChildren(IList children)
+        {
+            Children = (List<OrgUserTreeNode>)children;
+        }
+    }
+}

Api/Ewide.Core/Service/User/ISysUserService.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+using Ewide.Core.Service.User.Dto;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -29,5 +30,7 @@ namespace Ewide.Core.Service
 
         Task<dynamic> SendCode(Usermailphone input);
         Task<dynamic> CheckBindcode(Usermailphone input);
+
+        Task<dynamic> GetOrgUserTree(OrgUserInput input);
     }
 }

Api/Ewide.Core/Service/User/SysUserService.cs

@@ -1,4 +1,5 @@
 using Ewide.Core.Service.Role;
+using Ewide.Core.Service.User.Dto;
 using Ewide.Core.Util;
 using Furion.DatabaseAccessor;
 using Furion.DatabaseAccessor.Extensions;
@@ -25,6 +26,8 @@ namespace Ewide.Core.Service
     public class SysUserService : ISysUserService, IDynamicApiController, ITransient
     {
         private readonly IRepository<SysUser> _sysUserRep;  // 用户表仓储 
+        private readonly IRepository<SysOrg> _sysOrgRep;
+        private readonly IRepository<SysEmp> _sysEmpRep;
         private readonly IUserManager _userManager;
         private readonly ISysCacheService _sysCacheService;
         private readonly ISysEmpService _sysEmpService;
@@ -34,6 +37,8 @@ namespace Ewide.Core.Service
         private readonly ISysUserAreaService _sysUserAreaService;
 
         public SysUserService(IRepository<SysUser> sysUserRep,
+                              IRepository<SysOrg> sysOrgRep,
+                               IRepository<SysEmp> sysEmpRep,
                               IUserManager userManager,
                               IMemoryCache memoryCache,
                               ISysCacheService sysCacheService,
@@ -43,6 +48,8 @@ namespace Ewide.Core.Service
                               ISysUserAreaService sysUserAreaService)
         {
             _sysUserRep = sysUserRep;
+            _sysOrgRep = sysOrgRep;
+            _sysEmpRep = sysEmpRep;
             _userManager = userManager;
             _iMemoryCache = memoryCache;
             _sysCacheService = sysCacheService;
@@ -65,11 +72,10 @@ namespace Ewide.Core.Service
             var pid = input.SysEmpParam.OrgId;
 
             var sysEmpRep = Db.GetRepository<SysEmp>();
-            var sysOrgRep = Db.GetRepository<SysOrg>();
             var dataScopes = await GetUserDataScopeIdList(_userManager.UserId);
             var users = await _sysUserRep.DetachedEntities
                                          .Join(sysEmpRep.DetachedEntities, u => u.Id, e => e.Id, (u, e) => new { u, e })
-                                         .Join(sysOrgRep.DetachedEntities, n => n.e.OrgId, o => o.Id, (n, o) => new { n, o })
+                                         .Join(_sysOrgRep.DetachedEntities, n => n.e.OrgId, o => o.Id, (n, o) => new { n, o })
                                          .Where(!string.IsNullOrEmpty(searchValue), x => (x.n.u.Account.Contains(input.SearchValue) ||
                                                                                     x.n.u.Name.Contains(input.SearchValue) ||
                                                                                     x.n.u.Phone.Contains(input.SearchValue)))
@@ -652,5 +658,17 @@ namespace Ewide.Core.Service
                 }
             }
         }
+
+        [HttpPost("/sysUser/GetOrgUserTree")]
+        public async Task<dynamic> GetOrgUserTree(OrgUserInput input)
+        {
+            var list =  await (from u in _sysUserRep.DetachedEntities 
+                        join e in _sysEmpRep.DetachedEntities on u.Id equals e.Id
+                        select new OrgUserTreeNode { Id = u.Id, ParentId = e.OrgId,Type=1,Name=u.Name }).Union(
+                from o in _sysOrgRep.DetachedEntities 
+                select new OrgUserTreeNode { Id = o.Id, ParentId = o.Pid ,Type=0,Name=o.Name}).ToListAsync();
+            
+            return new TreeBuildUtil<OrgUserTreeNode>().DoTreeBuild(list);
+        }
     }
 }