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

完成pgSql结构调整

Browse Source
This commit is contained in:
yubaolee 2025-02-26 10:48:26 +08:00
parent 7316e17d3c
commit 92be71ac49
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenAuth.App/Base/SqlSugarBaseApp.cs
View File

@ -35,10 +35,6 @@ namespace OpenAuth.App
public T Get(string id) public T Get(string id)
{ {
if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
return SugarClient.Queryable<T>().Where("\"Id\"=@id", new {id = id}).First();
}
return SugarClient.Queryable<T>().Where("Id=@id", new {id = id}).First(); return SugarClient.Queryable<T>().Where("Id=@id", new {id = id}).First();
} }

2
OpenAuth.App/FlowApproverApp/FlowApproverApp.cs
View File

@ -56,7 +56,7 @@ namespace OpenAuth.App
CreateUserId = loginContext.User.Id, CreateUserId = loginContext.User.Id,
CreateUserName = loginContext.User.Name, CreateUserName = loginContext.User.Name,
CreateDate = DateTime.Now, CreateDate = DateTime.Now,
Content = $"【加签】流程加签给：{string.Join(",", objs.Select(u => u.ApproverName))}" Content = $"【加签】{loginContext.User.Name}加签给：{string.Join(",", objs.Select(u => u.ApproverName))}"
}).ExecuteCommand(); }).ExecuteCommand();
} }

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

@ -2,7 +2,7 @@
* @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com> * @Author: yubaolee <yubaolee@163.com> | ahfu~ <954478625@qq.com>
* @Date: 2024-12-13 16:55:17 * @Date: 2024-12-13 16:55:17
* @Description: 工作流实例表操作 * @Description: 工作流实例表操作
* @LastEditTime: 2025-02-25 22:42:53 * @LastEditTime: 2025-02-26 10:39:03
* Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved. * Copyright (c) 2024 by yubaolee | ahfu~ , All Rights Reserved.
*/ */
@ -617,6 +617,12 @@ namespace OpenAuth.App
from SysUser from SysUser
where fi.MakerList like '%' || Id || '%') "; where fi.MakerList like '%' || Id || '%') ";
} }
else if (SugarClient.CurrentConnectionConfig.DbType == DbType.PostgreSQL)
{
groupConcatSql = $@" (select string_agg(Account, ',')
from SysUser
where fi.MakerList like '%' || Id || '%') ";
}
string sql = String.Empty; string sql = String.Empty;
@ -705,17 +711,17 @@ namespace OpenAuth.App
select distinct FirstId as InstanceId select distinct FirstId as InstanceId
from Relevance rel from Relevance rel
inner join FlowInstance flow on rel.FirstId = flow.Id and flow.IsFinish = 1 inner join FlowInstance flow on rel.FirstId = flow.Id and flow.IsFinish = 1
where `Key` = '{Define.INSTANCE_NOTICE_USER}' where `key` = '{Define.INSTANCE_NOTICE_USER}'
and SecondId = '{user.User.Id}' and SecondId = '{user.User.Id}'
union union
select distinct a.FirstId as InstanceId select distinct a.FirstId as InstanceId
from Relevance a from Relevance a
inner join (select SecondId as RoleId inner join (select SecondId as RoleId
from Relevance from Relevance
where `Key` = 'UserRole' where `key` = 'UserRole'
and FirstId = '{user.User.Id}') b on a.SecondId = b.RoleId and FirstId = '{user.User.Id}') b on a.SecondId = b.RoleId
inner join FlowInstance flow on a.FirstId = flow.Id and flow.IsFinish = 1 inner join FlowInstance flow on a.FirstId = flow.Id and flow.IsFinish = 1
where a.`Key` = '{Define.INSTANCE_NOTICE_ROLE}') UniqueInstanceIds where a.`key` = '{Define.INSTANCE_NOTICE_ROLE}') UniqueInstanceIds
ON fi.Id = UniqueInstanceIds.InstanceId ON fi.Id = UniqueInstanceIds.InstanceId
"; ";
} }
@ -723,11 +729,14 @@ namespace OpenAuth.App
switch (SugarClient.CurrentConnectionConfig.DbType) switch (SugarClient.CurrentConnectionConfig.DbType)
{ {
case DbType.SqlServer: case DbType.SqlServer:
sql = sql.Replace("`Key`", "[Key]"); sql = sql.Replace("`key`", "[Key]");
sql = sql.Replace("from dual", ""); sql = sql.Replace("from dual", "");
break; break;
case DbType.Oracle: case DbType.Oracle:
sql = sql.Replace("`Key`", "\"KEY\""); sql = sql.Replace("`key`", "\"KEY\"");
break;
case DbType.PostgreSQL:
sql = sql.Replace("`key`", "key");
break; break;
} }