fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 22:49:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-03-18 09:08:17 +00:00
commit ce4ca35fd9
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowTasks.tsx
View File

@ -187,7 +187,7 @@ export function WorkflowTasks() {
const params = useActionParams(status); const params = useActionParams(status);
useEffect(() => { useEffect(() => {
setTitle?.(`${lang('Workflow todo')}${title ? `: ${compile(title)}` : ''}`); setTitle?.(`${lang('Workflow todos')}${title ? `: ${compile(title)}` : ''}`);
}, [taskType, status, setTitle, title, compile]); }, [taskType, status, setTitle, title, compile]);
useEffect(() => { useEffect(() => {

1
packages/plugins/@nocobase/plugin-workflow/src/server/Plugin.ts
View File

@ -774,6 +774,7 @@ export default class PluginWorkflowServer extends Plugin {
(await repository.countAll({ (await repository.countAll({
where: { where: {
userId: task.userId, userId: task.userId,
workflowId: { [Op.ne]: null },
}, },
transaction, transaction,
})) || []; })) || [];

1
packages/plugins/@nocobase/plugin-workflow/src/server/actions/workflowTasks.ts
View File

@ -18,6 +18,7 @@ export async function countMine(context: Context, next) {
(await repository.countAll({ (await repository.countAll({
where: { where: {
userId: context.state.currentUser.id, userId: context.state.currentUser.id,
workflowId: { [Op.ne]: null },
}, },
})) || []; })) || [];