lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-08-20 00:44:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚠️feat: #ICGHSO 统一使用SqlSugar

Browse Source
This commit is contained in:
yubaolee 2025-07-29 21:55:38 +08:00
parent 6a8eb675e9
commit 2fb964f9d0
4 changed files with 289 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
OpenAuth.App/Base/SqlSugarBaseTreeApp.cs Normal file
View File

@ -0,0 +1,58 @@
using System.Linq;
using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Interface;
using OpenAuth.Repository.Core;
using SqlSugar;
using OpenAuth.Repository.Interface;
namespace OpenAuth.App
{
/// <summary>
/// 树状结构处理
/// </summary>
/// <typeparam name="T"></typeparam>
/// /// <typeparam name="TDbContext"></typeparam>
public class SqlSugarBaseTreeApp<T> :SqlSugarBaseApp<T> where T : TreeEntity, new()
{
public SqlSugarBaseTreeApp(ISqlSugarClient client, IAuth auth)
: base(client, auth)
{
}
/// <summary>
/// 更新树状结构实体
/// </summary>
/// <param name="obj"></param>
/// <typeparam name="U"></typeparam>
public void UpdateTreeObj<U>(U obj) where U : TreeEntity, new()
{
CaculateCascade(obj);
//获取旧的的CascadeId
var cascadeId = SugarClient.Queryable<U>().First(o => o.Id == obj.Id).CascadeId;
//根据CascadeId查询子部门
var objs = SugarClient.Queryable<U>().Where(u => u.CascadeId.Contains(cascadeId) && u.Id != obj.Id)
.OrderBy(u => u.CascadeId).ToList();
//更新操作
SugarClient.Updateable(obj).ExecuteCommand();
//更新子模块的CascadeId
foreach (var a in objs)
{
a.CascadeId = a.CascadeId.Replace(cascadeId, obj.CascadeId);
if (a.ParentId == obj.Id)
{
a.ParentName = obj.Name;
}
SugarClient.Updateable(a).ExecuteCommand();
}
}
}
}

58
OpenAuth.App/OrgManager/OrgManagerApp.cs
View File

@ -7,10 +7,11 @@ using OpenAuth.App.Request;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository.Interface;
using SqlSugar;
namespace OpenAuth.App
{
public class OrgManagerApp : BaseTreeApp<SysOrg,OpenAuthDBContext>
public class OrgManagerApp : SqlSugarBaseTreeApp<SysOrg>
{
private RevelanceManagerApp _revelanceApp;
/// <summary>
@ -28,22 +29,20 @@ namespace OpenAuth.App
}
CaculateCascade(sysOrg);
UnitWork.ExecuteWithTransaction(() =>
{
UnitWork.Add(sysOrg);
UnitWork.Save();
SugarClient.Ado.BeginTran();
Repository.Insert(sysOrg);
//如果当前账号不是SYSTEM，则直接分配
if (loginContext.User.Account != Define.SYSTEM_USERNAME)
//如果当前账号不是SYSTEM，则直接分配
if (loginContext.User.Account != Define.SYSTEM_USERNAME)
{
_revelanceApp.Assign(new AssignReq
{
_revelanceApp.Assign(new AssignReq
{
type = Define.USERORG,
firstId = loginContext.User.Id,
secIds = new[] { sysOrg.Id }
});
}
});
type = Define.USERORG,
firstId = loginContext.User.Id,
secIds = new[] { sysOrg.Id }
});
}
SugarClient.Ado.CommitTran();
return sysOrg.Id;
}
@ -58,23 +57,22 @@ namespace OpenAuth.App
return sysOrg.Id;
}
/// <summary>
/// 删除指定ID的部门及其所有子部门
/// </summary>
public void DelOrgCascade(string[] ids)
{
var delOrgCascadeIds = UnitWork.Find<SysOrg>(u => ids.Contains(u.Id)).Select(u => u.CascadeId).ToArray();
var delOrgCascadeIds = SugarClient.Queryable<SysOrg>().Where(u => ids.Contains(u.Id)).Select(u => u.CascadeId).ToArray();
var delOrgIds = new List<string>();
foreach (var cascadeId in delOrgCascadeIds)
{
delOrgIds.AddRange(UnitWork.Find<SysOrg>(u=>u.CascadeId.Contains(cascadeId)).Select(u =>u.Id).ToArray());
delOrgIds.AddRange(SugarClient.Queryable<SysOrg>().Where(u => u.CascadeId.Contains(cascadeId)).Select(u => u.Id).ToArray());
}
UnitWork.Delete<Relevance>(u =>u.RelKey == Define.USERORG && delOrgIds.Contains(u.SecondId));
UnitWork.Delete<SysOrg>(u => delOrgIds.Contains(u.Id));
UnitWork.Save();
SugarClient.Deleteable<Relevance>().Where(u => u.RelKey == Define.USERORG && delOrgIds.Contains(u.SecondId)).ExecuteCommand();
SugarClient.Deleteable<SysOrg>().Where(u => delOrgIds.Contains(u.Id)).ExecuteCommand();
}
/// <summary>
@ -83,22 +81,22 @@ namespace OpenAuth.App
/// <param name="userId">The user unique identifier.</param>
public List<SysOrg> LoadForUser(string userId)
{
var result = from userorg in UnitWork.Find<Relevance>(null)
join org in UnitWork.Find<SysOrg>(null) on userorg.SecondId equals org.Id
where userorg.FirstId == userId && userorg.RelKey == Define.USERORG
select org;
var result = SugarClient.Queryable<Relevance>()
.LeftJoin<SysOrg>((u, o) => u.SecondId == o.Id)
.Where((u, o) => u.FirstId == userId && u.RelKey == Define.USERORG)
.Select((u, o) => o);
return result.ToList();
}
public OrgManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<SysOrg,OpenAuthDBContext> repository,IAuth auth,
RevelanceManagerApp revelanceApp) : base(unitWork, repository, auth)
public OrgManagerApp(ISqlSugarClient client, IAuth auth,
RevelanceManagerApp revelanceApp) : base(client, auth)
{
_revelanceApp = revelanceApp;
}
public string[] GetChairmanId(string[] orgIds)
{
return Repository.Find(u => orgIds.Contains(u.Id)&&u.ChairmanId!= null).Select(u => u.ChairmanId).ToArray();
return SugarClient.Queryable<SysOrg>().Where(u => orgIds.Contains(u.Id) && u.ChairmanId != null).Select(u => u.ChairmanId).ToArray();
}
}
}

76
OpenAuth.App/RoleManager/RoleApp.cs
View File

@ -11,9 +11,11 @@ using Microsoft.EntityFrameworkCore;
using OpenAuth.App.Request;
using OpenAuth.Repository;
using SqlSugar;
namespace OpenAuth.App
{
public class RoleApp : BaseStringApp<Role,OpenAuthDBContext>
public class RoleApp : SqlSugarBaseApp<Role>
{
private RevelanceManagerApp _revelanceApp;
@ -39,7 +41,7 @@ namespace OpenAuth.App
public async Task<PagedListDataResp<Role>> LoadAll(QueryRoleListReq request)
{
var result = new PagedListDataResp<Role>();
var objs = UnitWork.Find<Role>(null);
var objs = SugarClient.Queryable<Role>();
if (!string.IsNullOrEmpty(request.key))
{
objs = objs.Where(u => u.Name.Contains(request.key));
@ -59,7 +61,7 @@ namespace OpenAuth.App
/// <returns></returns>
public List<Role> LoadByIds(string[] ids)
{
return UnitWork.Find<Role>(u => ids.Contains(u.Id)).ToList();
return Repository.GetList(u => ids.Contains(u.Id));
}
@ -68,41 +70,38 @@ namespace OpenAuth.App
/// </summary>
public void Add(RoleView obj)
{
UnitWork.ExecuteWithTransaction(() =>
{
Role role = obj;
role.CreateTime = DateTime.Now;
UnitWork.Add(role);
UnitWork.Save();
obj.Id = role.Id; //要把保存后的ID存入view
//如果当前账号不是SYSTEM，则直接分配
var loginUser = _auth.GetCurrentUser();
if (loginUser.User.Account != Define.SYSTEM_USERNAME)
{
_revelanceApp.Assign(new AssignReq
{
type = Define.USERROLE,
firstId = loginUser.User.Id,
secIds = new[] {role.Id}
});
}
});
SugarClient.Ado.BeginTran();
Role role = obj;
role.CreateTime = DateTime.Now;
Repository.Insert(role);
obj.Id = role.Id; //要把保存后的ID存入view
//如果当前账号不是SYSTEM，则直接分配
var loginUser = _auth.GetCurrentUser();
if (loginUser.User.Account != Define.SYSTEM_USERNAME)
{
_revelanceApp.Assign(new AssignReq
{
type = Define.USERROLE,
firstId = loginUser.User.Id,
secIds = new[] {role.Id}
});
}
SugarClient.Ado.CommitTran();
}
/// <summary>
/// 删除角色时，需要删除角色对应的权限
/// </summary>
/// <param name="ids"></param>
public override void Delete(string[] ids)
public new void Delete(string[] ids)
{
UnitWork.ExecuteWithTransaction(() =>
{
UnitWork.Delete<Relevance>(u=>(u.RelKey == Define.ROLEMODULE || u.RelKey == Define.ROLEELEMENT) && ids.Contains(u.FirstId));
UnitWork.Delete<Relevance>(u=>u.RelKey == Define.USERROLE && ids.Contains(u.SecondId));
UnitWork.Delete<Role>(u =>ids.Contains(u.Id));
UnitWork.Save();
});
SugarClient.Ado.BeginTran();
SugarClient.Deleteable<Relevance>().Where(u=>(u.RelKey == Define.ROLEMODULE || u.RelKey == Define.ROLEELEMENT) && ids.Contains(u.FirstId)).ExecuteCommand();
SugarClient.Deleteable<Relevance>().Where(u=>u.RelKey == Define.USERROLE && ids.Contains(u.SecondId)).ExecuteCommand();
SugarClient.Deleteable<Role>().Where(u =>ids.Contains(u.Id)).ExecuteCommand();
SugarClient.Ado.CommitTran();
}
/// <summary>
@ -111,19 +110,16 @@ namespace OpenAuth.App
/// <param name="obj"></param>
public void Update(RoleView obj)
{
Role role = obj;
UnitWork.Update<Role>(u => u.Id == obj.Id, u => new Role
Repository.Update(u => new Role
{
Name = role.Name,
Status = role.Status
});
Name = obj.Name,
Status = obj.Status
}, u => u.Id == obj.Id);
}
public RoleApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<Role,OpenAuthDBContext> repository,
RevelanceManagerApp app,IAuth auth) : base(unitWork, repository, auth)
public RoleApp(ISqlSugarClient client,
RevelanceManagerApp app,IAuth auth) : base(client, auth)
{
_revelanceApp = app;
}

350
OpenAuth.App/UserManager/UserManagerApp.cs
View File

@ -12,21 +12,22 @@ using OpenAuth.App.Response;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using OpenAuth.Repository.Interface;
using SqlSugar;
namespace OpenAuth.App
{
public class UserManagerApp : BaseStringApp<SysUser,OpenAuthDBContext>
public class UserManagerApp : SqlSugarBaseApp<SysUser>
{
private RevelanceManagerApp _revelanceApp;
private OrgManagerApp _orgManagerApp;
public UserManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<SysUser,OpenAuthDBContext> repository,
RevelanceManagerApp app,IAuth auth, OrgManagerApp orgManagerApp) : base(unitWork, repository, auth)
public UserManagerApp(ISqlSugarClient client,
RevelanceManagerApp app, IAuth auth, OrgManagerApp orgManagerApp) : base(client, auth)
{
_revelanceApp = app;
_orgManagerApp = orgManagerApp;
}
public SysUser GetByAccount(string account)
{
return Repository.FirstOrDefault(u => u.Account == account);
return SugarClient.Queryable<SysUser>().First(u => u.Account == account);
}
/// <summary>
/// 加载当前登录用户可访问的一个部门及子部门全部用户
@ -35,40 +36,16 @@ namespace OpenAuth.App
public async Task<PagedDynamicDataResp> Load(QueryUserListReq request)
{
var loginUser = _auth.GetCurrentUser();
IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
var query = SugarClient.Queryable<SysUser>();
if (!string.IsNullOrEmpty(request.key))
{
query = UnitWork.Find<SysUser>(u => u.Name.Contains(request.key) || u.Account.Contains(request.key));
query = SugarClient.Queryable<SysUser>().Where(u => u.Name.Contains(request.key) || u.Account.Contains(request.key));
}
var userOrgs = from user in query
join user2 in UnitWork.Find<SysUser>(null)
on user.ParentId equals user2.Id into tempuser
from u in tempuser.DefaultIfEmpty()
join relevance in UnitWork.Find<Relevance>(u => u.RelKey == "UserOrg")
on user.Id equals relevance.FirstId into temp
from r in temp.DefaultIfEmpty()
join org in UnitWork.Find<SysOrg>(null)
on r.SecondId equals org.Id into orgtmp
from o in orgtmp.DefaultIfEmpty()
select new
{
user.Account,
user.Name,
user.Id,
user.Sex,
user.Status,
user.BizCode,
user.CreateId,
user.CreateTime,
user.TypeId,
user.TypeName,
user.ParentId,
ParentName = u.Name, //直属上级
Key = r.RelKey,
r.SecondId,
OrgId = o.Id,
OrgName = o.Name
};
var userOrgs = query
.LeftJoin<SysUser>((user, u) => user.ParentId == u.Id)
.LeftJoin<Relevance>((user, u, r) => user.Id == r.FirstId && r.RelKey == Define.USERORG)
.LeftJoin<SysOrg>((user, u, r, o) => r.SecondId == o.Id);
//如果请求的orgId不为空
if (!string.IsNullOrEmpty(request.orgId))
{
@ -76,33 +53,52 @@ namespace OpenAuth.App
var cascadeId = org.CascadeId;
var orgIds = loginUser.Orgs.Where(u => u.CascadeId.Contains(cascadeId)).Select(u => u.Id).ToArray();
//只获取机构里面的用户
userOrgs = userOrgs.Where(u => u.Key == Define.USERORG && orgIds.Contains(u.OrgId));
userOrgs = userOrgs.Where((user,u,r,o) => r.RelKey == Define.USERORG && orgIds.Contains(o.Id));
}
else //todo:如果请求的orgId为空，即为跟节点，这时可以额外获取到机构已经被删除的用户，从而进行机构分配。可以根据自己需求进行调整
{
var orgIds = loginUser.Orgs.Select(u => u.Id).ToArray();
//获取用户可以访问的机构的用户和没有任何机构关联的用户（机构被删除后，没有删除这里面的关联关系）
userOrgs = userOrgs.Where(u => (u.Key == Define.USERORG && orgIds.Contains(u.OrgId)) || (u.OrgId == null));
userOrgs = userOrgs.Where((user,u,r,o) => (r.RelKey == Define.USERORG && orgIds.Contains(o.Id)) || (o == null));
}
var userViews = (await userOrgs.ToListAsync()).GroupBy(b => b.Account)
.Select(u =>new UserView
{
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,
CreateTime = u.First().CreateTime,
CreateUser = u.First().CreateId,
OrganizationIds = string.Join(",", u.Select(x=>x.OrgId))
,Organizations = string.Join(",", u.Select(x=>x.OrgName))
});
var userOrgs2 = userOrgs.Select((user, u, r, o) => new {
Account = user.Account,
Name = user.Name,
Id = user.Id,
Sex = user.Sex,
Status = user.Status,
BizCode = user.BizCode,
CreateId = user.CreateId,
CreateTime = user.CreateTime,
TypeId = user.TypeId,
TypeName = user.TypeName,
ParentId = user.ParentId,
ParentName = u.Name,
Key = r.RelKey,
OrgId = o.Id,
OrgName = o.Name
});
var userViews = (await userOrgs2.ToListAsync()).GroupBy(b => b.Account)
.Select(u => new UserView
{
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,
CreateTime = u.First().CreateTime,
CreateUser = u.First().CreateId,
OrganizationIds = string.Join(",", u.Select(x => x.OrgId))
,
Organizations = string.Join(",", u.Select(x => x.OrgName))
});
return new PagedDynamicDataResp
{
Count =userViews.Count(),
Data =userViews.OrderBy(u => u.Name)
Count = userViews.Count(),
Data = userViews.OrderBy(u => u.Name)
.Skip((request.page - 1) * request.limit)
.Take(request.limit),
};
@ -113,46 +109,39 @@ namespace OpenAuth.App
/// </summary>
public async Task<PagedListDataResp<UserView>> LoadAll(QueryUserListReq request)
{
IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
if (!string.IsNullOrEmpty(request.key))
{
query = UnitWork.Find<SysUser>(u => u.Name.Contains(request.key) || u.Account.Contains(request.key));
}
var userOrgs = from user in query
join user2 in UnitWork.Find<SysUser>(null)
on user.ParentId equals user2.Id into tempuser
from u in tempuser.DefaultIfEmpty()
join relevance in UnitWork.Find<Relevance>(u => u.RelKey == "UserOrg")
on user.Id equals relevance.FirstId into temp
from r in temp.DefaultIfEmpty()
join org in UnitWork.Find<SysOrg>(null)
on r.SecondId equals org.Id into orgtmp
from o in orgtmp.DefaultIfEmpty()
select new
{
user.Account,
user.Name,
user.Id,
user.Sex,
user.Status,
user.BizCode,
user.CreateId,
user.CreateTime,
user.TypeId,
user.TypeName,
user.ParentId,
ParentName = u.Name, //直属上级
Key = r.RelKey,
r.SecondId,
OrgId = o.Id,
OrgName = o.Name
};
var query = SugarClient.Queryable<SysUser>();
if (!string.IsNullOrEmpty(request.key))
{
query = SugarClient.Queryable<SysUser>().Where(u => u.Name.Contains(request.key) || u.Account.Contains(request.key));
}
var userOrgs = query
.LeftJoin<SysUser>((user, u) => user.ParentId == u.Id)
.LeftJoin<Relevance>((user, u, r) => user.Id == r.FirstId && r.RelKey == Define.USERORG)
.LeftJoin<SysOrg>((user, u, r, o) => r.SecondId == o.Id);
//如果请求的orgId不为空
if (!string.IsNullOrEmpty(request.orgId))
{
userOrgs = userOrgs.Where(u => u.Key == Define.USERORG && u.OrgId == request.orgId);
userOrgs = userOrgs.Where((user,u,r,o) => r.RelKey == Define.USERORG && o.Id == request.orgId);
}
var userViews = (await userOrgs.ToListAsync()).GroupBy(b => b.Account).Select(u =>new UserView
var userOrgs2 = userOrgs.Select((user, u, r, o) => new {
Account = user.Account,
Name = user.Name,
Id = user.Id,
Sex = user.Sex,
Status = user.Status,
BizCode = user.BizCode,
CreateId = user.CreateId,
CreateTime = user.CreateTime,
TypeId = user.TypeId,
TypeName = user.TypeName,
ParentId = user.ParentId,
ParentName = u.Name,
Key = r.RelKey,
OrgId = o.Id,
OrgName = o.Name
});
var userViews = (await userOrgs2.ToListAsync()).GroupBy(b => b.Account).Select(u => new UserView
{
Id = u.First().Id,
Account = u.Key,
@ -163,8 +152,9 @@ namespace OpenAuth.App
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))
OrganizationIds = string.Join(",", u.Select(x => x.OrgId))
,
Organizations = string.Join(",", u.Select(x => x.OrgName))
});
return new PagedListDataResp<UserView>()
{
@ -176,65 +166,62 @@ namespace OpenAuth.App
}
public void AddOrUpdate(UpdateUserReq request)
{
request.ValidationEntity(u => new {u.Account,u.Name, u.OrganizationIds});
request.ValidationEntity(u => new { u.Account, u.Name, u.OrganizationIds });
if (string.IsNullOrEmpty(request.OrganizationIds))
throw new Exception("请为用户分配机构");
SysUser requser = request;
requser.CreateId = _auth.GetCurrentUser().User.Id;
UnitWork.ExecuteWithTransaction(() =>
SugarClient.Ado.BeginTran();
if (string.IsNullOrEmpty(request.Id))
{
if (string.IsNullOrEmpty(request.Id))
if (SugarClient.Queryable<SysUser>().Any(u => u.Account == request.Account))
{
if (UnitWork.Any<SysUser>(u => u.Account == request.Account))
{
throw new Exception("用户账号已存在");
}
if (string.IsNullOrEmpty(requser.Password))
{
requser.Password = requser.Account; //如果客户端没提供密码，默认密码同账号
}
requser.CreateTime = DateTime.Now;
UnitWork.Add(requser);
request.Id = requser.Id; //要把保存后的ID存入view
throw new Exception("用户账号已存在");
}
else
if (string.IsNullOrEmpty(requser.Password))
{
UnitWork.Update<SysUser>(u => u.Id == request.Id, u => new SysUser
{
Account = requser.Account,
BizCode = requser.BizCode,
Name = requser.Name,
Sex = requser.Sex,
Status = requser.Status,
ParentId = request.ParentId
});
if (!string.IsNullOrEmpty(requser.Password)) //密码为空的时候，不做修改
{
UnitWork.Update<SysUser>(u => u.Id == request.Id, u => new SysUser
{
Password = requser.Password
});
}
requser.Password = requser.Account; //如果客户端没提供密码，默认密码同账号
}
UnitWork.Save();
string[] orgIds = request.OrganizationIds.Split(',').ToArray();
_revelanceApp.DeleteBy(Define.USERORG, requser.Id);
_revelanceApp.Assign(Define.USERORG, orgIds.ToLookup(u => requser.Id));
});
requser.CreateTime = DateTime.Now;
Repository.Insert(requser);
request.Id = requser.Id; //要把保存后的ID存入view
}
else
{
Repository.Update(u => new SysUser
{
Account = requser.Account,
BizCode = requser.BizCode,
Name = requser.Name,
Sex = requser.Sex,
Status = requser.Status,
ParentId = request.ParentId
},u => u.Id == request.Id);
if (!string.IsNullOrEmpty(requser.Password)) //密码为空的时候，不做修改
{
Repository.Update(u => new SysUser
{
Password = requser.Password
},u => u.Id == request.Id);
}
}
string[] orgIds = request.OrganizationIds.Split(',').ToArray();
_revelanceApp.DeleteBy(Define.USERORG, requser.Id);
_revelanceApp.Assign(Define.USERORG, orgIds.ToLookup(u => requser.Id));
SugarClient.Ado.CommitTran();
}
/// <summary>
/// 删除用户,包含用户与组织关系、用户与角色关系
/// </summary>
/// <param name="ids"></param>
public override void Delete(string[] ids)
public new void Delete(string[] ids)
{
UnitWork.ExecuteWithTransaction(() =>
{
UnitWork.Delete<Relevance>(u =>(u.RelKey == Define.USERROLE || u.RelKey == Define.USERORG)
&& ids.Contains(u.FirstId));
UnitWork.Delete<SysUser>(u => ids.Contains(u.Id));
UnitWork.Save();
});
SugarClient.Ado.BeginTran();
SugarClient.Deleteable<Relevance>().Where(u => (u.RelKey == Define.USERROLE || u.RelKey == Define.USERORG)
&& ids.Contains(u.FirstId)).ExecuteCommand();
SugarClient.Deleteable<SysUser>().Where(u => ids.Contains(u.Id)).ExecuteCommand();
SugarClient.Ado.CommitTran();
}
/// <summary>
/// 修改密码
@ -242,10 +229,10 @@ namespace OpenAuth.App
/// <param name="request"></param>
public void ChangePassword(ChangePasswordReq request)
{
Repository.Update(u => u.Account == request.Account, user => new SysUser
Repository.Update(u => new SysUser
{
Password = request.Password
});
},u => u.Account == request.Account);
}
/// <summary>
/// 获取指定角色包含的用户列表
@ -254,15 +241,15 @@ namespace OpenAuth.App
/// <returns></returns>
public async Task<PagedDynamicDataResp> LoadByRole(QueryUserListByRoleReq request)
{
var users = from userRole in UnitWork.Find<Relevance>(u =>
u.SecondId == request.roleId && u.RelKey == Define.USERROLE)
join user in UnitWork.Find<SysUser>(null) on userRole.FirstId equals user.Id into temp
from c in temp.Where(u =>u.Id != null)
select c;
var users = SugarClient.Queryable<Relevance>()
.Where(u => u.SecondId == request.roleId && u.RelKey == Define.USERROLE)
.LeftJoin<SysUser>((userRole, user) => userRole.FirstId == user.Id)
.Where((userRole, user) => user.Id != null)
.Select((userRole, user) => user);
return new PagedDynamicDataResp
{
Count =await users.CountAsync(),
Data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
Count = await users.CountAsync(),
Data = await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
};
}
/// <summary>
@ -272,15 +259,15 @@ namespace OpenAuth.App
/// <returns></returns>
public async Task<PagedDynamicDataResp> LoadByOrg(QueryUserListByOrgReq request)
{
var users = from userOrg in UnitWork.Find<Relevance>(u =>
u.SecondId == request.orgId && u.RelKey == Define.USERORG)
join user in UnitWork.Find<SysUser>(null) on userOrg.FirstId equals user.Id into temp
from c in temp.Where(u =>u.Id != null)
select c;
var users = SugarClient.Queryable<Relevance>()
.Where(u => u.SecondId == request.orgId && u.RelKey == Define.USERORG)
.LeftJoin<SysUser>((userOrg, user) => userOrg.FirstId == user.Id)
.Where((userOrg, user) => user.Id != null)
.Select((userOrg, user) => user);
return new PagedDynamicDataResp
{
Count =await users.CountAsync(),
Data =await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
Count = await users.CountAsync(),
Data = await users.Skip((request.page - 1) * request.limit).Take(request.limit).ToListAsync()
};
}
/// <summary>
@ -293,13 +280,13 @@ namespace OpenAuth.App
{
throw new Exception("不能修改超级管理员信息");
}
Repository.Update(u => u.Account == request.Account, user => new SysUser
{
Name = request.Name,
Sex = request.Sex
});
Repository.Update(u => new SysUser
{
Name = request.Name,
Sex = request.Sex
},u => u.Account == request.Account);
}
/// <summary>
/// 获取用户的直属上级ID
/// </summary>
@ -311,7 +298,7 @@ namespace OpenAuth.App
{
throw new Exception("超级管理员没有直属上级，请检查配置");
}
return Repository.FirstOrDefault(u => u.Id == userid).ParentId;
return SugarClient.Queryable<SysUser>().First(u => u.Id == userid).ParentId;
}
@ -337,23 +324,19 @@ namespace OpenAuth.App
where RelKey = '{Define.INSTANCE_NOTICE_ROLE}'
and FirstId = '{instanceId}') b on a.SecondId = b.RoleId
where RelKey = 'UserRole') userids on u.Id = userids.UserId";
var users = UnitWork.FromSql<SysUser>(sql);
return users.Select(u=>u.Id).ToList();
var users = SugarClient.Ado.SqlQuery<SysUser>(sql);
return users.Select(u => u.Id).ToList();
}
public List<UserView> LoadByIds(string[] ids)
{
var users = Repository.Find(u => ids.Contains(u.Id));
var users = SugarClient.Queryable<SysUser>().Where(u => ids.Contains(u.Id));
//获取用户及用户关联的机构
var userOrgs = from user in users
join relevance in UnitWork.Find<Relevance>(u => u.RelKey == "UserOrg")
on user.Id equals relevance.FirstId into temp
from r in temp.DefaultIfEmpty()
join org in UnitWork.Find<SysOrg>(null)
on r.SecondId equals org.Id into orgtmp
from o in orgtmp.DefaultIfEmpty()
select new
var userOrgs = users
.LeftJoin<Relevance>((user, r) => user.Id == r.FirstId && r.RelKey == Define.USERORG)
.LeftJoin<SysOrg>((user, r, o) => r.SecondId == o.Id)
.Select((user, r, o) => new
{
user.Id,
user.Account,
@ -365,21 +348,22 @@ namespace OpenAuth.App
user.ParentId,
OrgId = o.Id,
OrgName = o.Name
};
});
var userViews = userOrgs.GroupBy(b => b.Account).Select(u => new UserView
var userOrgsList = userOrgs.ToList(); // 先执行ToList()
var userViews = userOrgsList.GroupBy(b => b.Account).Select(g => new UserView
{
Id = u.First().Id,
Account = u.Key,
Name = u.First().Name,
Sex = u.First().Sex,
Status = u.First().Status,
CreateTime = u.First().CreateTime,
CreateUser = u.First().CreateId,
ParentName = u.First().ParentId,
ParentId = u.First().ParentId,
OrganizationIds = string.Join(",", u.Select(x=>x.OrgId))
,Organizations = string.Join(",", u.Select(x=>x.OrgName))
Id = g.First().Id,
Account = g.Key,
Name = g.First().Name,
Sex = g.First().Sex,
Status = g.First().Status,
CreateTime = g.First().CreateTime,
CreateUser = g.First().CreateId,
ParentName = g.First().ParentId,
ParentId = g.First().ParentId,
OrganizationIds = string.Join(",", g.Select(x => x.OrgId)),
Organizations = string.Join(",", g.Select(x => x.OrgName))
});
return userViews.ToList();