From bf8e04447ab0d1f5cbc3bddbbade1109fca8932b Mon Sep 17 00:00:00 2001 From: o2sword <171715986@qq.com> Date: Wed, 1 Jun 2022 10:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?(=E7=94=A8=E6=88=B7=E6=9C=89=E5=A4=9A=E8=BA=AB=E4=BB=BD)?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assemble/surface/jaxrs/work/ActionCreate.java | 7 ++++--- .../assemble/surface/jaxrs/work/ActionCreateForce.java | 3 ++- .../jaxrs/work/ActionCreateWithApplicationProcess.java | 3 ++- .../work/ActionCreateWithApplicationProcessForce.java | 3 ++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java index fd0631ad18..41866f7046 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreate.java @@ -71,6 +71,7 @@ class ActionCreate extends BaseAction { if (!business.application().allowRead(effectivePerson, roles, identities, units, application)) { throw new ExceptionApplicationAccessDenied(effectivePerson.getDistinguishedName(), application.getId()); } + identities = List.of(identity); List groups = business.organization().group().listWithIdentity(identities); if (!business.process().startable(effectivePerson, identities, units, groups, process)) { throw new ExceptionAccessDenied(effectivePerson, process); @@ -105,7 +106,7 @@ class ActionCreate extends BaseAction { /** * 拼装返回结果 - * + * * @param effectivePerson * @param workId * @return @@ -140,7 +141,7 @@ class ActionCreate extends BaseAction { /** * 如果不是草稿那么需要进行设置 - * + * * @param wi * @param identity * @param workId @@ -402,4 +403,4 @@ class ActionCreate extends BaseAction { wo.setTaskCompletedList(list); } -} \ No newline at end of file +} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateForce.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateForce.java index 8bce2d05cf..d8558a25d7 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateForce.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateForce.java @@ -69,6 +69,7 @@ class ActionCreateForce extends BaseAction { if (!business.application().allowRead(effectivePerson, roles, identities, units, application)) { throw new ExceptionApplicationAccessDenied(effectivePerson.getDistinguishedName(), application.getId()); } + identities = List.of(identity); List groups = business.organization().group().listWithIdentity(identities); if (!business.process().startable(effectivePerson, identities, units, groups, process)) { throw new ExceptionAccessDenied(effectivePerson, process); @@ -393,4 +394,4 @@ class ActionCreateForce extends BaseAction { // wo.setTaskCompletedList(results); } -} \ No newline at end of file +} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcess.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcess.java index 8658ac5858..9ed059dc5b 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcess.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcess.java @@ -77,6 +77,7 @@ class ActionCreateWithApplicationProcess extends BaseAction { if (!business.application().allowRead(effectivePerson, roles, identities, units, application)) { throw new ExceptionApplicationAccessDenied(effectivePerson.getDistinguishedName(), application.getId()); } + identities = List.of(identity); List groups = business.organization().group().listWithIdentity(identities); if (!business.process().startable(effectivePerson, identities, units, groups, process)) { throw new ExceptionAccessDenied(effectivePerson, process); @@ -386,4 +387,4 @@ class ActionCreateWithApplicationProcess extends BaseAction { // wo.setTaskCompletedList(results); } -} \ No newline at end of file +} diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcessForce.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcessForce.java index 987ec27c8f..0c72a083cf 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcessForce.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionCreateWithApplicationProcessForce.java @@ -76,6 +76,7 @@ class ActionCreateWithApplicationProcessForce extends BaseAction { if (!business.application().allowRead(effectivePerson, roles, identities, units, application)) { throw new ExceptionApplicationAccessDenied(effectivePerson.getDistinguishedName(), application.getId()); } + identities = List.of(identity); List groups = business.organization().group().listWithIdentity(identities); if (!business.process().startable(effectivePerson, identities, units, groups, process)) { throw new ExceptionAccessDenied(effectivePerson, process); @@ -385,4 +386,4 @@ class ActionCreateWithApplicationProcessForce extends BaseAction { // wo.setTaskCompletedList(results); } -} \ No newline at end of file +} -- GitLab