fix issue #I80UEX 完善人员可以选择直接上级和部门负责人

OpenAuth.App/AuthStrategies/AuthStrategyContext.cs

@@ -59,7 +59,7 @@ namespace OpenAuth.App
             get { return _strategy.Resources; }
         }
 
-        public List<SysOrg> Orgs
+        public List<OrgView> Orgs
         {
             get { return _strategy.Orgs; }
         }

OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs

@@ -23,13 +23,14 @@ using OpenAuth.App.Response;
 using OpenAuth.Repository;
 using OpenAuth.Repository.Domain;
 using OpenAuth.Repository.Interface;
+using SqlSugar;
 
 namespace OpenAuth.App
 {
     /// <summary>
     /// 普通用户授权策略
     /// </summary>
-    public class NormalAuthStrategy :BaseStringApp<User,OpenAuthDBContext>, IAuthStrategy
+    public class NormalAuthStrategy : SqlSugarBaseApp<User>, IAuthStrategy
     {
         
         protected User _user;
@@ -40,34 +41,12 @@ namespace OpenAuth.App
         public List<ModuleView> Modules
         {
             get {
-                var moduleIds = UnitWork.Find<Relevance>(
+                var moduleIds = SugarClient.Queryable<Relevance>().Where(
                     u =>
-                        (u.Key == Define.ROLEMODULE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+                        (u.Key == Define.ROLEMODULE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
                 
-                var modules = (from module in UnitWork.Find<Module>(u =>moduleIds.Contains(u.Id))
+                return SugarClient.Queryable<ModuleView>().Where(m =>moduleIds.Contains(m.Id)).Includes(x=>x.Elements).ToList();
-                    select new ModuleView
-                    {
-                        SortNo = module.SortNo,
-                        Name = module.Name,
-                        Code = module.Code,
-                        CascadeId = module.CascadeId,
-                        Id = module.Id,
-                        IconName = module.IconName,
-                        Url = module.Url,
-                        ParentId = module.ParentId,
-                        ParentName = module.ParentName,
-                        IsSys = module.IsSys,
-                        Status = module.Status
-                    }).ToList();
                 
-                var usermoduleelements = ModuleElements;
-
-                foreach (var module in modules)
-                {
-                    module.Elements =usermoduleelements.Where(u => u.ModuleId == module.Id).ToList();
-                }
-
-                return modules;
             }
         }
 
@@ -75,37 +54,43 @@ namespace OpenAuth.App
         {
             get
             {
-                var elementIds = UnitWork.Find<Relevance>(
+                var elementIds = SugarClient.Queryable<Relevance>().Where(
                     u =>
-                        (u.Key == Define.ROLEELEMENT && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+                        (u.Key == Define.ROLEELEMENT && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
-                var usermoduleelements = UnitWork.Find<ModuleElement>(u => elementIds.Contains(u.Id));
+                var usermoduleelements = SugarClient.Queryable<ModuleElement>().Where(u => elementIds.Contains(u.Id));
                 return usermoduleelements.ToList();
             }
         }
 
         public List<Role> Roles
         {
-            get { return UnitWork.Find<Role>(u => _userRoleIds.Contains(u.Id)).ToList(); }
+            get { return SugarClient.Queryable<Role>().Where(u => _userRoleIds.Contains(u.Id)).ToList(); }
         }
 
         public List<Resource> Resources
         {
             get
             {
-                var resourceIds = UnitWork.Find<Relevance>(
+                var resourceIds = SugarClient.Queryable<Relevance>().Where(
                     u =>
-                        (u.Key == Define.ROLERESOURCE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId);
+                        (u.Key == Define.ROLERESOURCE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
-                return UnitWork.Find<Resource>(u => resourceIds.Contains(u.Id)).ToList();
+                return SugarClient.Queryable<Resource>().Where(u => resourceIds.Contains(u.Id)).ToList();
             }
         }
 
-        public List<SysOrg> Orgs
+        public List<OrgView> Orgs
         {
             get
             {
-                var orgids = UnitWork.Find<Relevance>(
+                var orgids = SugarClient.Queryable<Relevance>().Where(
-                    u =>u.FirstId == _user.Id && u.Key == Define.USERORG).Select(u => u.SecondId);
+                    u =>u.FirstId == _user.Id && u.Key == Define.USERORG).Select(u => u.SecondId).ToList();
-                return UnitWork.Find<SysOrg>(u => orgids.Contains(u.Id)).ToList();
+                return SugarClient.Queryable<SysOrg>().Where(org =>orgids.Contains(org.Id))
+                    .LeftJoin<User>((org, user) => org.ChairmanId ==user.Id)
+                    .Select((org,user)=>new OrgView
+                    {
+                        Id = org.Id.SelectAll(),
+                        ChairmanName = user.Name
+                    }).ToList();
             }
         }
 
@@ -115,16 +100,18 @@ namespace OpenAuth.App
             set
             {
                 _user = value;
-                _userRoleIds = UnitWork.Find<Relevance>(u => u.FirstId == _user.Id && u.Key == Define.USERROLE).Select(u => u.SecondId).ToList();
+                _userRoleIds = SugarClient.Queryable<Relevance>().Where(u => u.FirstId == _user.Id && u.Key == Define.USERROLE)
+                    .Select(u => u.SecondId).ToList();
             }
         }
         
 
         public List<BuilderTableColumn> GetTableColumns(string moduleCode)
         {
-            var allprops = UnitWork.Find<BuilderTableColumn>(u => u.TableName.ToLower() == moduleCode.ToLower());
+            var allprops = SugarClient.Queryable<BuilderTableColumn>()
+                .Where(u => u.TableName.ToLower() == moduleCode.ToLower());
             //如果是子表，直接返回所有字段
-            var builderTable = UnitWork.FirstOrDefault<BuilderTable>(u => u.TableName.ToLower() == moduleCode.ToLower());
+            var builderTable = SugarClient.Queryable<BuilderTable>().First(u => u.TableName.ToLower() == moduleCode.ToLower());
             if (builderTable == null)
             {
                 throw new Exception($"代码生成器中找不到{moduleCode.ToLower()}的定义");
@@ -136,15 +123,15 @@ namespace OpenAuth.App
             }
 
             //如果是系统模块，直接返回所有字段。防止开发者把模块配置成系统模块，还在外层调用loginContext.GetProperties("xxxx");
-            bool? isSysModule = UnitWork.FirstOrDefault<Module>(u => u.Code == moduleCode)?.IsSys;
+            bool? isSysModule = SugarClient.Queryable<Module>().First(u => u.Code == moduleCode)?.IsSys;
             if (isSysModule!= null && isSysModule.Value)
             {
                 return allprops.ToList();
             }
             
-            var props =UnitWork.Find<Relevance>(u =>
+            var props =SugarClient.Queryable<Relevance>().Where(u =>
                     u.Key == Define.ROLEDATAPROPERTY && _userRoleIds.Contains(u.FirstId) && u.SecondId == moduleCode)
-                .Select(u => u.ThirdId);
+                .Select(u => u.ThirdId).ToList();
 
             return allprops.Where(u => props.Contains(u.ColumnName)).ToList();
         }
@@ -154,22 +141,22 @@ namespace OpenAuth.App
             var allprops = _dbExtension.GetTableColumnsFromDb(moduleCode);
 
             //如果是系统模块，直接返回所有字段。防止开发者把模块配置成系统模块，还在外层调用loginContext.GetProperties("xxxx");
-            bool? isSysModule = UnitWork.FirstOrDefault<Module>(u => u.Code == moduleCode)?.IsSys;
+            bool? isSysModule = SugarClient.Queryable<Module>().First(u => u.Code == moduleCode)?.IsSys;
             if (isSysModule!= null && isSysModule.Value)
             {
                 return allprops.ToList();
             }
             
-            var props =UnitWork.Find<Relevance>(u =>
+            var props =SugarClient.Queryable<Relevance>().Where(u =>
                     u.Key == Define.ROLEDATAPROPERTY && _userRoleIds.Contains(u.FirstId) && u.SecondId == moduleCode)
-                .Select(u => u.ThirdId);
+                .Select(u => u.ThirdId).ToList();
 
             return allprops.Where(u => props.Contains(u.ColumnName)).ToList();
         }
 
         //用户角色
 
-        public NormalAuthStrategy(IUnitWork<OpenAuthDBContext> unitWork, IRepository<User,OpenAuthDBContext> repository, DbExtension dbExtension) : base(unitWork, repository,null)
+        public NormalAuthStrategy(ISqlSugarClient client,DbExtension dbExtension) : base(client, null)
         {
             _dbExtension = dbExtension;
         }

OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs

@@ -22,6 +22,7 @@ using OpenAuth.App.Response;
 using OpenAuth.Repository;
 using OpenAuth.Repository.Domain;
 using OpenAuth.Repository.Interface;
+using SqlSugar;
 
 namespace OpenAuth.App
 {
@@ -30,57 +31,43 @@ namespace OpenAuth.App
     /// <para>超级管理员权限</para>
     /// <para>超级管理员使用guid.empty为ID，可以根据需要修改</para>
     /// </summary>
-    public class SystemAuthStrategy : BaseStringApp<User,OpenAuthDBContext>, IAuthStrategy
+    public class SystemAuthStrategy : SqlSugarBaseApp<User>, IAuthStrategy
     {
         protected User _user;
         private DbExtension _dbExtension;
 
         public List<ModuleView> Modules
         {
-            get {
+            get
-                var modules = (from module in UnitWork.Find<Module>(null)
-                    select new ModuleView
             {
-                        SortNo = module.SortNo,
+                return SugarClient.Queryable<ModuleView>().Includes(x=>x.Elements).ToList();
-                        Name = module.Name,
-                        Id = module.Id,
-                        CascadeId = module.CascadeId,
-                        Code = module.Code,
-                        IconName = module.IconName,
-                        Url = module.Url,
-                        ParentId = module.ParentId,
-                        ParentName = module.ParentName,
-                        IsSys = module.IsSys,
-                        Status = module.Status
-                    }).ToList();
-
-                foreach (var module in modules)
-                {
-                    module.Elements = UnitWork.Find<ModuleElement>(u => u.ModuleId == module.Id).ToList();
-                }
-
-                return modules;
             }
         }
 
         public List<Role> Roles
         {
-            get { return UnitWork.Find<Role>(null).ToList(); }
+            get { return SugarClient.Queryable<Role>().ToList(); }
         }
 
         public List<ModuleElement> ModuleElements
         {
-            get { return UnitWork.Find<ModuleElement>(null).ToList(); }
+            get { return SugarClient.Queryable<ModuleElement>().ToList(); }
         }
 
         public List<Resource> Resources
         {
-            get { return UnitWork.Find<Resource>(null).ToList(); }
+            get { return SugarClient.Queryable<Resource>().ToList(); }
         }
 
-        public List<SysOrg> Orgs
+        public List<OrgView> Orgs
         {
-            get { return UnitWork.Find<SysOrg>(null).ToList(); }
+            get { return SugarClient.Queryable<SysOrg>()
+                .LeftJoin<User>((org, user) => org.ChairmanId ==user.Id)
+                .Select((org,user)=>new OrgView
+            {
+                Id = org.Id.SelectAll(),
+                ChairmanName = user.Name
+            }).ToList(); }
         }
 
         public User User
@@ -95,7 +82,7 @@ namespace OpenAuth.App
 
         public List<BuilderTableColumn> GetTableColumns(string moduleCode)
         {
-            return UnitWork.Find<BuilderTableColumn>(u => u.TableName.ToLower() == moduleCode.ToLower()).ToList();
+            return SugarClient.Queryable<BuilderTableColumn>().Where(u => u.TableName.ToLower() == moduleCode.ToLower()).ToList();
         }
 
         public List<BuilderTableColumn> GetTableColumnsFromDb(string moduleCode)
@@ -104,7 +91,7 @@ namespace OpenAuth.App
         }
 
 
-        public SystemAuthStrategy(IUnitWork<OpenAuthDBContext> unitWork, IRepository<User,OpenAuthDBContext> repository, DbExtension dbExtension) : base(unitWork, repository, null)
+        public SystemAuthStrategy(ISqlSugarClient client,DbExtension dbExtension) : base(client, null)
         {
             _dbExtension = dbExtension;
             _user = new User

OpenAuth.App/Interface/IAuthStrategy.cs

@@ -33,7 +33,7 @@ namespace OpenAuth.App
 
          List<Resource> Resources { get; }
 
-         List<SysOrg> Orgs { get; }
+         List<OrgView> Orgs { get; }
 
          User User
         {

OpenAuth.App/ModuleManager/Response/ModuleView.cs

@@ -1,9 +1,11 @@
 using System.Collections.Generic;
 using Infrastructure;
 using OpenAuth.Repository.Domain;
+using SqlSugar;
 
 namespace OpenAuth.App.Response
 {
+    [SugarTable("Module")]
     public class ModuleView
     {
         /// <summary>
@@ -53,9 +55,6 @@ namespace OpenAuth.App.Response
         /// </summary>
         public int Status { get; set; }
         
-
-        public bool Checked { get; set; }
-
         /// <summary>
         /// 排序号
         /// </summary>
@@ -68,6 +67,7 @@ namespace OpenAuth.App.Response
         /// <summary>
         /// 模块中的元素
         /// </summary>
+        [Navigate(NavigateType.OneToMany, nameof(ModuleElement.ModuleId),nameof(Id))] 
         public List<ModuleElement> Elements { get; set; }
 
         public static implicit operator ModuleView(Module module)

OpenAuth.App/OrgManager/Response/OrgView.cs

@@ -0,0 +1,13 @@
+using System.ComponentModel;
+using OpenAuth.Repository.Domain;
+
+namespace OpenAuth.App.Response;
+
+public class OrgView: SysOrg
+{
+    /// <summary>
+    /// 负责人
+    /// </summary>
+    [Description("负责人")]
+    public string ChairmanName { get; set; }
+}

OpenAuth.App/UserManager/Response/UserView.cs

@@ -50,7 +50,10 @@ namespace OpenAuth.App.Response
         /// </summary>
         public string ParentId { get; set; }
 
-
+        /// <summary>
+        /// 直接上级
+        /// </summary>
+        public string ParentName { get; set; }
 
         /// <summary>
         /// 创建时间

OpenAuth.App/UserManager/UserManagerApp.cs

@@ -41,6 +41,9 @@ namespace OpenAuth.App
                 query = UnitWork.Find<User>(u => u.Name.Contains(request.key) || u.Account.Contains(request.key));
             }
             var userOrgs = from user in query 
+                join user2 in UnitWork.Find<User>(null)
+                    on user.ParentId equals user2.Id into tempuser
+                from u in tempuser.DefaultIfEmpty() 
                 join relevance in UnitWork.Find<Relevance>(u => u.Key == "UserOrg")
                     on user.Id equals relevance.FirstId into temp
                 from r in temp.DefaultIfEmpty()
@@ -60,6 +63,7 @@ namespace OpenAuth.App
                     user.TypeId,
                     user.TypeName,
                     user.ParentId,
+                    ParentName = u.Name, //直属上级
                     r.Key,
                     r.SecondId,
                     OrgId = o.Id,
@@ -86,6 +90,7 @@ namespace OpenAuth.App
                 Id = u.First().Id,
                 Account = u.Key,
                 Name = u.First().Name,
+                ParentName = u.First().ParentName,
                 Sex = u.First().Sex,
                 Status = u.First().Status,
                 ParentId = u.First().ParentId,
@@ -114,6 +119,9 @@ namespace OpenAuth.App
                query = UnitWork.Find<User>(u => u.Name.Contains(request.key) || u.Account.Contains(request.key));
            }
            var userOrgs = from user in query
+               join user2 in UnitWork.Find<User>(null)
+                   on user.ParentId equals user2.Id into tempuser
+               from u in tempuser.DefaultIfEmpty() 
                join relevance in UnitWork.Find<Relevance>(u => u.Key == "UserOrg")
                    on user.Id equals relevance.FirstId into temp
                from r in temp.DefaultIfEmpty()
@@ -132,6 +140,8 @@ namespace OpenAuth.App
                    user.CreateTime,
                    user.TypeId,
                    user.TypeName,
+                   user.ParentId,
+                   ParentName = u.Name, //直属上级
                    r.Key,
                    r.SecondId,
                    OrgId = o.Id,
@@ -151,6 +161,8 @@ namespace OpenAuth.App
                 Status = u.First().Status,
                 CreateTime = u.First().CreateTime,
                 CreateUser = u.First().CreateId,
+                ParentName = u.First().ParentName,
+                ParentId = u.First().ParentId,
                 OrganizationIds = string.Join(",", u.Select(x=>x.OrgId))
                 ,Organizations = string.Join(",", u.Select(x=>x.OrgName))
             });

OpenAuth.Mvc/Controllers/UserSessionController.cs

@@ -118,7 +118,7 @@ namespace OpenAuth.Mvc.Controllers
         /// </summary>
         public string GetOrgs()
         {
-             var resp = new Response<List<SysOrg>>();
+             var resp = new Response<List<OrgView>>();
             try
             {
                 resp.Result = _authStrategyContext.Orgs;

OpenAuth.Repository/Domain/Org.cs

@@ -11,6 +11,7 @@ using System;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations.Schema;
 using OpenAuth.Repository.Core;
+using SqlSugar;
 
 namespace OpenAuth.Repository.Domain
 {
@@ -18,6 +19,7 @@ namespace OpenAuth.Repository.Domain
 	/// 组织表
 	/// </summary>
       [Table("Org")]
+      [SugarTable("Org")]
     public partial class SysOrg : TreeEntity
     {
         public SysOrg()

OpenAuth.WebApi/Controllers/CheckController.cs

@@ -146,9 +146,9 @@ namespace OpenAuth.WebApi.Controllers
         /// 获取登录用户的所有可访问的组织信息
         /// </summary>
         [HttpGet]
-        public Response<List<SysOrg>> GetOrgs()
+        public Response<List<OrgView>> GetOrgs()
         {
-            var result = new Response<List<SysOrg>>();
+            var result = new Response<List<OrgView>>();
             try
             {
                 result.Result = _authStrategyContext.Orgs;