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

调整User为SysUser、Resource为SysResource

Browse Source
This commit is contained in:
yubaolee
2025-02-19 12:44:42 +08:00
parent 839256e8bb
commit 2a2d83d026
27 changed files with 417 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenAuth.App/AuthContextFactory.cs
View File

@@ -52,7 +52,7 @@ namespace OpenAuth.App
else
{
service = _normalAuthStrategy;
service.User = _unitWork.FirstOrDefault<User>(u => u.Account == username);
service.User = _unitWork.FirstOrDefault<SysUser>(u => u.Account == username);
}
return new AuthStrategyContext(service);

4
OpenAuth.App/AuthStrategies/AuthStrategyContext.cs
View File

@@ -34,7 +34,7 @@ namespace OpenAuth.App
this._strategy = strategy;
}
public User User
public SysUser User
{
get { return _strategy.User; }
}
@@ -54,7 +54,7 @@ namespace OpenAuth.App
get { return _strategy.Roles; }
}
public List<Resource> Resources
public List<SysResource> Resources
{
get { return _strategy.Resources; }
}

12
OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs
View File

@@ -30,10 +30,10 @@ namespace OpenAuth.App
/// <summary>
/// 普通用户授权策略
/// </summary>
public class NormalAuthStrategy : SqlSugarBaseApp<User>, IAuthStrategy
public class NormalAuthStrategy : SqlSugarBaseApp<SysUser>, IAuthStrategy
{
protected User _user;
protected SysUser _user;
private List<string> _userRoleIds; //用户角色GUID
private DbExtension _dbExtension;
@@ -79,14 +79,14 @@ namespace OpenAuth.App
get { return SugarClient.Queryable<Role>().Where(u => _userRoleIds.Contains(u.Id)).ToList(); }
}
public List<Resource> Resources
public List<SysResource> Resources
{
get
{
var resourceIds = SugarClient.Queryable<Relevance>().Where(
u =>
u.Key == Define.ROLERESOURCE && _userRoleIds.Contains(u.FirstId)).Select(u => u.SecondId).ToList();
return SugarClient.Queryable<Resource>().Where(u => resourceIds.Contains(u.Id)).ToList();
return SugarClient.Queryable<SysResource>().Where(u => resourceIds.Contains(u.Id)).ToList();
}
}
@@ -97,7 +97,7 @@ namespace OpenAuth.App
var orgids = SugarClient.Queryable<Relevance>().Where(
u =>u.FirstId == _user.Id && u.Key == Define.USERORG).Select(u => u.SecondId).ToList();
return SugarClient.Queryable<SysOrg>().Where(org =>orgids.Contains(org.Id))
.LeftJoin<User>((org, user) => org.ChairmanId ==user.Id)
.LeftJoin<SysUser>((org, user) => org.ChairmanId ==user.Id)
.Select((org,user)=>new OrgView
{
Id = org.Id.SelectAll(),
@@ -106,7 +106,7 @@ namespace OpenAuth.App
}
}
public User User
public SysUser User
{
get { return _user; }
set

14
OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs
View File

@@ -31,9 +31,9 @@ namespace OpenAuth.App
/// <para>超级管理员权限</para>
/// <para>超级管理员使用guid.empty为ID，可以根据需要修改</para>
/// </summary>
public class SystemAuthStrategy : SqlSugarBaseApp<User>, IAuthStrategy
public class SystemAuthStrategy : SqlSugarBaseApp<SysUser>, IAuthStrategy
{
protected User _user;
protected SysUser _user;
private DbExtension _dbExtension;
public List<ModuleView> Modules
@@ -54,15 +54,15 @@ namespace OpenAuth.App
get { return SugarClient.Queryable<ModuleElement>().ToList(); }
}
public List<Resource> Resources
public List<SysResource> Resources
{
get { return SugarClient.Queryable<Resource>().ToList(); }
get { return SugarClient.Queryable<SysResource>().ToList(); }
}
public List<OrgView> Orgs
{
get { return SugarClient.Queryable<SysOrg>()
.LeftJoin<User>((org, user) => org.ChairmanId ==user.Id)
.LeftJoin<SysUser>((org, user) => org.ChairmanId ==user.Id)
.Select((org,user)=>new OrgView
{
Id = org.Id.SelectAll(),
@@ -70,7 +70,7 @@ namespace OpenAuth.App
}).ToList(); }
}
public User User
public SysUser User
{
get { return _user; }
set //禁止外部设置
@@ -94,7 +94,7 @@ namespace OpenAuth.App
public SystemAuthStrategy(ISqlSugarClient client,DbExtension dbExtension) : base(client, null)
{
_dbExtension = dbExtension;
_user = new User
_user = new SysUser
{
Account = Define.SYSTEM_USERNAME,
Name = "超级管理员",

214
OpenAuth.App/FlowInstance/FlowInstanceApp.cs
View File

@@ -2,7 +2,7 @@
* @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com>
* @Date: 2024-12-13 16:55:17
* @Description: 工作流实例表操作
* @LastEditTime: 2025-02-13 17:26:19
* @LastEditTime: 2025-02-19 11:43:24
* Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved.
*/
@@ -592,141 +592,135 @@ namespace OpenAuth.App
var user = _auth.GetCurrentUser();
//行转列专用SQL
string groupConcatSql = $@" ( SELECT GROUP_CONCAT(Account SEPARATOR ',')
FROM `User`
FROM `SysUser`
WHERE fi.MakerList like concat('%', Id, '%') ) ";
//sqlserver的行转列需要特殊处理
if (SugarClient.CurrentConnectionConfig.DbType == DbType.SqlServer)
if(SugarClient.CurrentConnectionConfig.DbType == DbType.SqlServer)
{
groupConcatSql = $@" STUFF((
SELECT ',' + Account
FROM [User]
FROM [SysUser]
WHERE fi.MakerList LIKE '%' + Id + '%'
FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 1, '') ";
}
else if (SugarClient.CurrentConnectionConfig.DbType == DbType.Oracle)
{
groupConcatSql = $@" (select listagg(""Account"", ',') within group (order by ""Account"")
from ""User""
where fi.""MakerList"" like '%' || ""Id"" || '%') ";
groupConcatSql = $@" (select listagg(Account, ',') within group (order by Account)
from SysUser
where fi.MakerList like '%' || Id || '%') ";
}
string sql = String.Empty;
if (request.type == "wait") //待办事项（即需要我处理的流程）
{
sql = $@"
SELECT {"fi." + Quote("Id")},
{"fi." + Quote("CreateUserName")},
{"fi." + Quote("ActivityName")},
{"fi." + Quote("CreateDate")},
{"fi." + Quote("CustomName")},
{"fi." + Quote("Code")},
{"fi." + Quote("Description")},
{"fi." + Quote("IsFinish")},
SELECT fi.Id,
fi.CreateUserName,
fi.ActivityName,
fi.CreateDate,
fi.CustomName,
fi.Code,
fi.Description,
fi.IsFinish,
CASE
WHEN {"fi." + Quote("MakerList")} = '1' THEN '所有人'
WHEN {"fi." + Quote("MakerList")} = '00000000-0000-0000-0000-000000000000' THEN 'System'
ELSE {groupConcatSql}
END AS {Quote("MakerList")}
FROM {Quote("FlowInstance")} fi
JOIN (
SELECT {"fith." + Quote("Id")}
FROM {Quote("FlowInstance")} fith
WHERE ({"fith." + Quote("MakerList")} = '1' or {"fith." + Quote("MakerList")} LIKE '%{user.User.Id}%')
and ({"fith." + Quote("IsFinish")} = {FlowInstanceStatus.Running} or {"fith." + Quote("IsFinish")} = {FlowInstanceStatus.Rejected})
and not exists (
SELECT 1
FROM {Quote("FlowApprover")}
WHERE {"fith." + Quote("Id")} = {Quote("InstanceId")}
and {"fith." + Quote("ActivityId")} = {Quote("ActivityId")}
and {Quote("Status")} = 0
)
UNION
SELECT {"fa." + Quote("InstanceId")}
FROM {Quote("FlowApprover")} fa
WHERE {"fa." + Quote("Status")} = 0
AND {"fa." + Quote("ApproverId")} = '{user.User.Id}'
) UniqueInstanceIds
ON {"fi." + Quote("Id")} = {"UniqueInstanceIds." + Quote("Id")}
";
WHEN fi.MakerList = '1' THEN '所有人'
WHEN fi.MakerList = '00000000-0000-0000-0000-000000000000' THEN 'System'
ELSE {groupConcatSql}
END AS MakerList
FROM FlowInstance fi
JOIN (SELECT fith.Id
FROM FlowInstance fith
WHERE (MakerList = '1' or MakerList LIKE '%{user.User.Id}%')
and (fith.IsFinish = {FlowInstanceStatus.Running} or fith.IsFinish = {FlowInstanceStatus.Rejected})
and not exists (select 1
from flowapprover
where fith.Id = InstanceId
and fith.ActivityId = ActivityId
and Status = 0)
UNION
SELECT fa.InstanceId
FROM FlowApprover fa
WHERE fa.Status = 0
AND fa.ApproverId = '{user.User.Id}') UniqueInstanceIds
ON fi.Id = UniqueInstanceIds.Id";
}
else if (request.type == "disposed") //已办事项（即我参与过的流程）
{
sql = $@"
SELECT {"fi." + Quote("Id")},
{"fi." + Quote("CreateUserName")},
{"fi." + Quote("ActivityName")},
{"fi." + Quote("CreateDate")},
{"fi." + Quote("CustomName")},
{"fi." + Quote("Code")},
{"fi." + Quote("Description")},
{"fi." + Quote("IsFinish")},
CASE
WHEN {"fi." + Quote("MakerList")} = '1' THEN '所有人'
WHEN {"fi." + Quote("MakerList")} = '00000000-0000-0000-0000-000000000000' THEN 'System'
ELSE {groupConcatSql}
END AS {Quote("MakerList")}
FROM {Quote("FlowInstance")} fi
JOIN (
SELECT {"fith." + Quote("InstanceId")}
FROM {Quote("FlowInstanceOperationHistory")} fith
WHERE {"fith." + Quote("CreateUserId")} = '{user.User.Id}'
UNION
SELECT {"fa." + Quote("InstanceId")}
FROM {Quote("FlowApprover")} fa
WHERE {"fa." + Quote("Status")} <> 0
AND {"fa." + Quote("ApproverId")} = '{user.User.Id}'
) UniqueInstanceIds
ON {"fi." + Quote("Id")} = {"UniqueInstanceIds." + Quote("InstanceId")}
";
SELECT fi.Id,
fi.CreateUserName,
fi.ActivityName,
fi.CreateDate,
fi.CustomName,
fi.Code,
fi.Description,
fi.IsFinish,
CASE
WHEN fi.MakerList = '1' THEN '所有人'
WHEN fi.MakerList = '00000000-0000-0000-0000-000000000000' THEN 'System'
ELSE {groupConcatSql}
END AS MakerList
FROM FlowInstance fi
JOIN (SELECT fith.InstanceId
FROM FlowInstanceOperationHistory fith
WHERE fith.CreateUserId = '{user.User.Id}'
UNION
SELECT fa.InstanceId
FROM FlowApprover fa
WHERE fa.Status <> 0
AND fa.ApproverId = '{user.User.Id}') UniqueInstanceIds
ON fi.Id = UniqueInstanceIds.InstanceId
";
}
else //我的流程（我创建的及知会我的）
{
sql = $@"
SELECT {"fi." + Quote("Id")},
{"fi." + Quote("CreateUserName")},
{"fi." + Quote("ActivityName")},
{"fi." + Quote("CreateDate")},
{"fi." + Quote("CustomName")},
{"fi." + Quote("Code")},
{"fi." + Quote("Description")},
{"fi." + Quote("IsFinish")},
CASE
WHEN {"fi." + Quote("MakerList")} = '1' THEN '所有人'
WHEN {"fi." + Quote("MakerList")} = '00000000-0000-0000-0000-000000000000' THEN 'System'
ELSE {groupConcatSql}
END AS {Quote("MakerList")}
FROM {Quote("FlowInstance")} fi
JOIN (
SELECT {Quote("Id")} as {Quote("InstanceId")}
FROM {Quote("FlowInstance")}
WHERE {Quote("CreateUserId")} = '{user.User.Id}'
UNION
SELECT DISTINCT {Quote("FirstId")} as {Quote("InstanceId")}
FROM {Quote("Relevance")} rel
INNER JOIN {Quote("FlowInstance")} flow ON {"rel." + Quote("FirstId")} = {"flow." + Quote("Id")} and {"flow." + Quote("IsFinish")} = 1
WHERE {Quote("Key")} = '{Define.INSTANCE_NOTICE_USER}'
AND {Quote("SecondId")} = '{user.User.Id}'
UNION
SELECT DISTINCT {"a." + Quote("FirstId")} as {Quote("InstanceId")}
FROM {Quote("Relevance")} a
INNER JOIN (
SELECT {Quote("SecondId")} as {Quote("RoleId")}
FROM {Quote("Relevance")}
WHERE {Quote("Key")} = 'UserRole'
AND {Quote("FirstId")} = '{user.User.Id}'
) b ON {"a." + Quote("SecondId")} = {"b." + Quote("RoleId")}
INNER JOIN {Quote("FlowInstance")} flow ON {"a." + Quote("FirstId")} = {"flow." + Quote("Id")} and {"flow." + Quote("IsFinish")} = 1
WHERE {"a." + Quote("Key")} = '{Define.INSTANCE_NOTICE_ROLE}'
) UniqueInstanceIds
ON {"fi." + Quote("Id")} = {"UniqueInstanceIds." + Quote("InstanceId")}
";
SELECT fi.Id,
fi.CreateUserName,
fi.ActivityName,
fi.CreateDate,
fi.CustomName,
fi.Code,
fi.Description,
fi.IsFinish,
CASE
WHEN fi.MakerList = '1' THEN '所有人'
WHEN fi.MakerList = '00000000-0000-0000-0000-000000000000' THEN 'System'
ELSE {groupConcatSql}
END AS MakerList
FROM FlowInstance fi
JOIN (select Id as InstanceId
from FlowInstance
where CreateUserId = '{user.User.Id}'
union
select distinct FirstId as InstanceId
from Relevance rel
inner join FlowInstance flow on rel.FirstId = flow.Id and flow.IsFinish = 1
where `Key` = '{Define.INSTANCE_NOTICE_USER}'
and SecondId = '{user.User.Id}'
union
select distinct a.FirstId as InstanceId
from Relevance a
inner join (select SecondId as RoleId
from Relevance
where `Key` = 'UserRole'
and FirstId = '{user.User.Id}') b on a.SecondId = b.RoleId
inner join FlowInstance flow on a.FirstId = flow.Id and flow.IsFinish = 1
where a.`Key` = '{Define.INSTANCE_NOTICE_ROLE}') UniqueInstanceIds
ON fi.Id = UniqueInstanceIds.InstanceId
";
}
switch (SugarClient.CurrentConnectionConfig.DbType)
{
case DbType.SqlServer:
sql = sql.Replace("`Key`", "[Key]");
sql = sql.Replace("from dual", "");
break;
case DbType.Oracle:
sql = sql.Replace("`Key`", "\"KEY\"");
break;
}
var finalQuery = SugarClient.SqlQueryable<FlowInstance>(sql)
@@ -738,18 +732,6 @@ namespace OpenAuth.App
return result;
}
string Quote(string name)
{
switch (SugarClient.CurrentConnectionConfig.DbType)
{
case DbType.SqlServer:
return $"[{name}]";
case DbType.Oracle:
return $"\"{name}\"";
default:
return $"`{name}`";
}
}
public List<FlowInstanceOperationHistory> QueryHistories(QueryFlowInstanceHistoryReq request)
{

4
OpenAuth.App/Interface/IAuthStrategy.cs
View File

@@ -31,11 +31,11 @@ namespace OpenAuth.App
List<Role> Roles { get; }
List<Resource> Resources { get; }
List<SysResource> Resources { get; }
List<OrgView> Orgs { get; }
User User
SysUser User
{
get;set;
}

10
OpenAuth.App/Resources/ResourceApp.cs
View File

@@ -14,13 +14,13 @@ namespace OpenAuth.App
/// <summary>
/// 分类管理
/// </summary>
public class ResourceApp:SqlSugarBaseApp<Resource>
public class ResourceApp:SqlSugarBaseApp<SysResource>
{
private RevelanceManagerApp _revelanceApp;
public void Add(AddOrUpdateResReq resource)
{
var obj = resource.MapTo<Resource>();
var obj = resource.MapTo<SysResource>();
CaculateCascade(obj);
obj.CreateTime = DateTime.Now;
var user = _auth.GetCurrentUser().User;
@@ -32,7 +32,7 @@ namespace OpenAuth.App
public void Update(AddOrUpdateResReq obj)
{
var user = _auth.GetCurrentUser().User;
Repository.Update(u => new Resource
Repository.Update(u => new SysResource
{
Name = obj.Name,
Disable = obj.Disable,
@@ -51,10 +51,10 @@ namespace OpenAuth.App
},u => u.Id == obj.Id);
}
public IEnumerable<Resource> LoadForRole(string appId, string roleId)
public IEnumerable<SysResource> LoadForRole(string appId, string roleId)
{
var elementIds = _revelanceApp.Get(Define.ROLERESOURCE, true, roleId);
return SugarClient.Queryable<Resource>().Where(u => elementIds.Contains(u.Id) && (appId == null || appId =="" || u.AppId == appId)).ToArray();
return SugarClient.Queryable<SysResource>().Where(u => elementIds.Contains(u.Id) && (appId == null || appId =="" || u.AppId == appId)).ToArray();
}
public async Task<TableData> Load(QueryResourcesReq request)

18
OpenAuth.App/SSO/LoginParse.cs
View File

@@ -16,11 +16,11 @@ namespace OpenAuth.App.SSO
{
//这个地方使用IRepository<User> 而不使用UserManagerApp是防止循环依赖
public IRepository<User,OpenAuthDBContext> _app;
public IRepository<SysUser,OpenAuthDBContext> _app;
private ICacheContext _cacheContext;
private AppManager _appInfoService;
public LoginParse( AppManager infoService, ICacheContext cacheContext, IRepository<User,OpenAuthDBContext> userApp)
public LoginParse( AppManager infoService, ICacheContext cacheContext, IRepository<SysUser,OpenAuthDBContext> userApp)
{
_appInfoService = infoService;
_cacheContext = cacheContext;
@@ -40,10 +40,10 @@ namespace OpenAuth.App.SSO
// throw new Exception("应用不存在");
// }
//获取用户信息
User userInfo = null;
SysUser sysUserInfo = null;
if (model.Account == Define.SYSTEM_USERNAME)
{
userInfo = new User
sysUserInfo = new SysUser
{
Id = Guid.Empty.ToString(),
Account = Define.SYSTEM_USERNAME,
@@ -53,19 +53,19 @@ namespace OpenAuth.App.SSO
}
else
{
userInfo = _app.FirstOrDefault(u =>u.Account == model.Account);
sysUserInfo = _app.FirstOrDefault(u =>u.Account == model.Account);
}
if (userInfo == null)
if (sysUserInfo == null)
{
throw new Exception("用户不存在");
}
if (userInfo.Password != model.Password)
if (sysUserInfo.Password != model.Password)
{
throw new Exception("密码错误");
}
if (userInfo.Status != 0)
if (sysUserInfo.Status != 0)
{
throw new Exception("账号状态异常，可能已停用");
}
@@ -73,7 +73,7 @@ namespace OpenAuth.App.SSO
var currentSession = new UserAuthSession
{
Account = model.Account,
Name = userInfo.Name,
Name = sysUserInfo.Name,
Token = Guid.NewGuid().ToString().GetHashCode().ToString("x"),
AppKey = model.AppKey,
CreateTime = DateTime.Now

12
OpenAuth.App/SysMessage/SysMessageApp.cs
View File

@@ -63,10 +63,10 @@ namespace OpenAuth.App
/// <param name="message"></param>
public void SendMsgTo(string userId, string message)
{
User user = null;
SysUser sysUser = null;
if (userId == Guid.Empty.ToString())
{
user = new User
sysUser = new SysUser
{
Name = Define.SYSTEM_USERNAME,
Id = userId
@@ -74,17 +74,17 @@ namespace OpenAuth.App
}
else
{
user = UnitWork.FirstOrDefault<User>(u => u.Id == userId);
sysUser = UnitWork.FirstOrDefault<SysUser>(u => u.Id == userId);
}
if (user == null)
if (sysUser == null)
{
_logger.LogError($"未能找到用户{userId},不能给该用户发送消息");
return;
}
Repository.Add(new SysMessage
{
ToId = user.Id,
ToName = user.Name,
ToId = sysUser.Id,
ToName = sysUser.Name,
TypeName = "系统消息",
TypeId ="SYS_MSG",
FromId = Guid.Empty.ToString(),

4
OpenAuth.App/Test/TestAsync.cs
View File

@@ -50,11 +50,11 @@ namespace OpenAuth.App.Test
private async Task AddOrUpdate()
{
var repository = _autofacServiceProvider.GetService<IRepository<User,OpenAuthDBContext>>();
var repository = _autofacServiceProvider.GetService<IRepository<SysUser,OpenAuthDBContext>>();
var account = "user_" + DateTime.Now.ToString("yyyy_MM_dd HH:mm:ss");
var user = new User
var user = new SysUser
{
Account = account,
Name = account

6
OpenAuth.App/Test/TestCache.cs
View File

@@ -49,14 +49,14 @@ namespace OpenAuth.App.Test
public void SetObj()
{
var app = _autofacServiceProvider.GetService<ICacheContext>();
app.Set("user:info", new User
app.Set("user:info", new SysUser
{
Name = "测试",
Account ="Test",
BizCode = "0.1.1"
}, DateTime.Now.AddDays(1));
var result = app.Get<User>("user:info");
var result = app.Get<SysUser>("user:info");
Console.WriteLine($"redis结果:{JsonHelper.Instance.Serialize(result)}");
}
@@ -68,7 +68,7 @@ namespace OpenAuth.App.Test
{
var app = _autofacServiceProvider.GetService<ICacheContext>();
var result = app.Get<User>("noexistkey");
var result = app.Get<SysUser>("noexistkey");
Console.WriteLine($"redis结果:{JsonHelper.Instance.Serialize(result)}");
}

8
OpenAuth.App/UserManager/Request/UpdateUserReq.cs
View File

@@ -61,14 +61,14 @@ namespace OpenAuth.App.Request
[Required(ErrorMessage = "请为用户分配机构")]
public string OrganizationIds { get; set; }
public static implicit operator UpdateUserReq(User user)
public static implicit operator UpdateUserReq(SysUser sysUser)
{
return user.MapTo<UpdateUserReq>();
return sysUser.MapTo<UpdateUserReq>();
}
public static implicit operator User(UpdateUserReq view)
public static implicit operator SysUser(UpdateUserReq view)
{
return view.MapTo<User>();
return view.MapTo<SysUser>();
}
public UpdateUserReq()

8
OpenAuth.App/UserManager/Response/UserView.cs
View File

@@ -76,14 +76,14 @@ namespace OpenAuth.App.Response
public string OrganizationIds { get; set; }
public static implicit operator UserView(User user)
public static implicit operator UserView(SysUser sysUser)
{
return user.MapTo<UserView>();
return sysUser.MapTo<UserView>();
}
public static implicit operator User(UserView view)
public static implicit operator SysUser(UserView view)
{
return view.MapTo<User>();
return view.MapTo<SysUser>();
}
public UserView()

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

@@ -14,17 +14,17 @@ using OpenAuth.Repository.Domain;
using OpenAuth.Repository.Interface;
namespace OpenAuth.App
{
public class UserManagerApp : BaseStringApp<User,OpenAuthDBContext>
public class UserManagerApp : BaseStringApp<SysUser,OpenAuthDBContext>
{
private RevelanceManagerApp _revelanceApp;
private OrgManagerApp _orgManagerApp;
public UserManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<User,OpenAuthDBContext> repository,
public UserManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<SysUser,OpenAuthDBContext> repository,
RevelanceManagerApp app,IAuth auth, OrgManagerApp orgManagerApp) : base(unitWork, repository, auth)
{
_revelanceApp = app;
_orgManagerApp = orgManagerApp;
}
public User GetByAccount(string account)
public SysUser GetByAccount(string account)
{
return Repository.FirstOrDefault(u => u.Account == account);
}
@@ -35,13 +35,13 @@ namespace OpenAuth.App
public async Task<TableData> Load(QueryUserListReq request)
{
var loginUser = _auth.GetCurrentUser();
IQueryable<User> query = UnitWork.Find<User>(null);
IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
if (!string.IsNullOrEmpty(request.key))
{
query = UnitWork.Find<User>(u => u.Name.Contains(request.key) || u.Account.Contains(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<User>(null)
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.Key == "UserOrg")
@@ -113,13 +113,13 @@ namespace OpenAuth.App
/// </summary>
public async Task<TableResp<UserView>> LoadAll(QueryUserListReq request)
{
IQueryable<User> query = UnitWork.Find<User>(null);
IQueryable<SysUser> query = UnitWork.Find<SysUser>(null);
if (!string.IsNullOrEmpty(request.key))
{
query = UnitWork.Find<User>(u => u.Name.Contains(request.key) || u.Account.Contains(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<User>(null)
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.Key == "UserOrg")
@@ -179,13 +179,13 @@ namespace OpenAuth.App
request.ValidationEntity(u => new {u.Account,u.Name, u.OrganizationIds});
if (string.IsNullOrEmpty(request.OrganizationIds))
throw new Exception("请为用户分配机构");
User requser = request;
SysUser requser = request;
requser.CreateId = _auth.GetCurrentUser().User.Id;
UnitWork.ExecuteWithTransaction(() =>
{
if (string.IsNullOrEmpty(request.Id))
{
if (UnitWork.Any<User>(u => u.Account == request.Account))
if (UnitWork.Any<SysUser>(u => u.Account == request.Account))
{
throw new Exception("用户账号已存在");
}
@@ -199,7 +199,7 @@ namespace OpenAuth.App
}
else
{
UnitWork.Update<User>(u => u.Id == request.Id, u => new User
UnitWork.Update<SysUser>(u => u.Id == request.Id, u => new SysUser
{
Account = requser.Account,
BizCode = requser.BizCode,
@@ -210,7 +210,7 @@ namespace OpenAuth.App
});
if (!string.IsNullOrEmpty(requser.Password)) //密码为空的时候，不做修改
{
UnitWork.Update<User>(u => u.Id == request.Id, u => new User
UnitWork.Update<SysUser>(u => u.Id == request.Id, u => new SysUser
{
Password = requser.Password
});
@@ -232,7 +232,7 @@ namespace OpenAuth.App
{
UnitWork.Delete<Relevance>(u =>(u.Key == Define.USERROLE || u.Key == Define.USERORG)
&& ids.Contains(u.FirstId));
UnitWork.Delete<User>(u => ids.Contains(u.Id));
UnitWork.Delete<SysUser>(u => ids.Contains(u.Id));
UnitWork.Save();
});
}
@@ -242,7 +242,7 @@ namespace OpenAuth.App
/// <param name="request"></param>
public void ChangePassword(ChangePasswordReq request)
{
Repository.Update(u => u.Account == request.Account, user => new User
Repository.Update(u => u.Account == request.Account, user => new SysUser
{
Password = request.Password
});
@@ -256,7 +256,7 @@ namespace OpenAuth.App
{
var users = from userRole in UnitWork.Find<Relevance>(u =>
u.SecondId == request.roleId && u.Key == Define.USERROLE)
join user in UnitWork.Find<User>(null) on userRole.FirstId equals user.Id into temp
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;
return new TableData
@@ -274,7 +274,7 @@ namespace OpenAuth.App
{
var users = from userOrg in UnitWork.Find<Relevance>(u =>
u.SecondId == request.orgId && u.Key == Define.USERORG)
join user in UnitWork.Find<User>(null) on userOrg.FirstId equals user.Id into temp
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;
return new TableData
@@ -293,7 +293,7 @@ namespace OpenAuth.App
{
throw new Exception("不能修改超级管理员信息");
}
Repository.Update(u => u.Account == request.Account, user => new User
Repository.Update(u => u.Account == request.Account, user => new SysUser
{
Name = request.Name,
Sex = request.Sex
@@ -349,7 +349,7 @@ namespace OpenAuth.App
sql = sql.Replace("`Key`", "\"Key\"");
}
var users = UnitWork.FromSql<User>(sql);
var users = UnitWork.FromSql<SysUser>(sql);
return users.Select(u=>u.Id).ToList();
}
}