From 21857c4db594b11933f9a9e1d718b8a520ceddfc Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Tue, 18 Mar 2025 17:07:53 +0800
Subject: [PATCH] fix(plugin-workflow): fix legacy tasks count after workflow
 deleted (#6493)

* fix(plugin-workflow): fix legacy tasks count after workflow deleted

* fix(plugin-workflow): fix locale
---
 .../@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx      | 2 +-
 packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts | 1 +
 .../plugin-workflow/src/server/actions/workflowTasks.ts         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
index a638697118..606624e949 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
+++ b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
@@ -187,7 +187,7 @@ export function WorkflowTasks() {
   const params = useActionParams(status);
 
   useEffect(() => {
-    setTitle?.(`${lang('Workflow todo')}${title ? `: ${compile(title)}` : ''}`);
+    setTitle?.(`${lang('Workflow todos')}${title ? `: ${compile(title)}` : ''}`);
   }, [taskType, status, setTitle, title, compile]);
 
   useEffect(() => {
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
index da6257dd76..a9abb48bee 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
@@ -774,6 +774,7 @@ export default class PluginWorkflowServer extends Plugin {
         (await repository.countAll({
           where: {
             userId: task.userId,
+            workflowId: { [Op.ne]: null },
           },
           transaction,
         })) || [];
diff --git a/packages/plugins/@nocobase/plugin-workflow/src/server/actions/workflowTasks.ts b/packages/plugins/@nocobase/plugin-workflow/src/server/actions/workflowTasks.ts
index eb83449b6d..9d9ed7d5c9 100644
--- a/packages/plugins/@nocobase/plugin-workflow/src/server/actions/workflowTasks.ts
+++ b/packages/plugins/@nocobase/plugin-workflow/src/server/actions/workflowTasks.ts
@@ -18,6 +18,7 @@ export async function countMine(context: Context, next) {
     (await repository.countAll({
       where: {
         userId: context.state.currentUser.id,
+        workflowId: { [Op.ne]: null },
       },
     })) || [];