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

修复待审批和已审列表

Browse Source
This commit is contained in:
yubaolee 2024-10-02 19:25:58 +08:00
parent 6cfed27598
commit 43012c89a8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -852,6 +852,7 @@ namespace OpenAuth.App
if (request.type == "wait") //待办事项 if (request.type == "wait") //待办事项
{ {
//包括加签人包含当前用户，审批人包含当前用户且没有加签节点的
var query = SugarClient.SqlQueryable<FlowInstance>($@" var query = SugarClient.SqlQueryable<FlowInstance>($@"
SELECT fi.* SELECT fi.*
FROM FlowInstance fi FROM FlowInstance fi
@ -859,6 +860,11 @@ namespace OpenAuth.App
FROM FlowInstance fith FROM FlowInstance fith
WHERE (MakerList = '1' or MakerList LIKE '%{user.User.Id}%') WHERE (MakerList = '1' or MakerList LIKE '%{user.User.Id}%')
and (fith.IsFinish = {FlowInstanceStatus.Running} or fith.IsFinish = {FlowInstanceStatus.Rejected}) 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 UNION
SELECT fa.InstanceId SELECT fa.InstanceId
FROM FlowApprover fa FROM FlowApprover fa
@ -877,7 +883,7 @@ namespace OpenAuth.App
SELECT fi.* SELECT fi.*
FROM FlowInstance fi FROM FlowInstance fi
JOIN (SELECT fith.InstanceId JOIN (SELECT fith.InstanceId
FROM FlowInstanceTransitionHistory fith FROM FlowInstanceOperationHistory fith
WHERE fith.CreateUserId = '{user.User.Id}' WHERE fith.CreateUserId = '{user.User.Id}'
UNION UNION
SELECT fa.InstanceId SELECT fa.InstanceId