From 627a0403d110ab6507cc9c0079bad4671859db03 Mon Sep 17 00:00:00 2001 From: o2null Date: Thu, 28 Jan 2021 10:36:54 +0000 Subject: [PATCH] =?UTF-8?q?Merge=20branch=20'fix/=E5=A4=84=E7=90=86?= =?UTF-8?q?=E8=BD=AC=E4=BA=A4=E7=9A=84=E6=8E=88=E6=9D=83=E6=B2=A1=E6=9C=89?= =?UTF-8?q?record=E7=9A=84=E9=97=AE=E9=A2=98'=20into=20'project/chinamobil?= =?UTF-8?q?e-=E9=87=8D=E5=BA=86=E7=A7=BB=E5=8A=A8'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [流程平台]处理转交的授权没有record的问题 See merge request o2oa/o2oa!2935 (cherry picked from commit 52cf078f0313d36fc62c79e9d2b53441f67d1ac7) 70c7c395 处理转交的授权没有record的问题 --- .../processing/jaxrs/task/ActionAppend.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java index 819b778f34..24d30b2f12 100644 --- a/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java +++ b/o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java @@ -1,7 +1,9 @@ package com.x.processplatform.service.processing.jaxrs.task; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.TimeUnit; @@ -10,6 +12,8 @@ import javax.script.CompiledScript; import javax.script.ScriptContext; import javax.script.SimpleScriptContext; +import com.x.base.core.project.logger.Logger; +import com.x.base.core.project.logger.LoggerFactory; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -45,6 +49,8 @@ import com.x.processplatform.service.processing.processor.manual.TaskIdentity; class ActionAppend extends BaseAction { + private static Logger logger = LoggerFactory.getLogger(ActionAppend.class); + ActionResult execute(EffectivePerson effectivePerson, String id, JsonElement jsonElement) throws Exception { final Wi wi = this.convertToWrapIn(jsonElement, Wi.class); @@ -65,6 +71,7 @@ class ActionAppend extends BaseAction { public ActionResult call() throws Exception { ActionResult result = new ActionResult<>(); Wo wo = new Wo(); + String workId = ""; try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { Business business = new Business(emc); Task task = emc.find(id, Task.class); @@ -75,6 +82,7 @@ class ActionAppend extends BaseAction { if (null == work) { throw new ExceptionEntityNotExist(task.getWork(), Work.class); } + workId = work.getId(); Manual manual = (Manual) business.element().get(task.getActivity(), ActivityType.manual); Route route = getRoute(business, task, manual); List identities = new ArrayList<>(); @@ -141,6 +149,10 @@ class ActionAppend extends BaseAction { taskIdentity.getFromIdentity()); } } + //properties中的集合对象需要重新new对象set进去，这样jpa才会更新数据 + Map manualEmpowerMap = new LinkedHashMap(); + manualEmpowerMap.putAll(work.getProperties().getManualEmpowerMap()); + work.getProperties().setManualEmpowerMap(manualEmpowerMap); // 转派后设置过期为空 // emc.beginTransaction(Task.class); // task.setExpired(false); @@ -197,4 +209,4 @@ class ActionAppend extends BaseAction { } -} \ No newline at end of file +} -- GitLab