diff --git a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Reroute.java b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Reroute.java index 02b1903a5cd7e7b93cd4bef1dfcfa52bc3a2994c..5af220171ac2490eaee57e1cbe1a41bfceba923b 100644 --- a/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Reroute.java +++ b/o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2Reroute.java @@ -50,7 +50,7 @@ class V2Reroute extends BaseAction { private Work work; private WorkLog workLog; private Record record; - private Activity activity; + // private Activity activity; private Activity destinationActivity; private String series = StringTools.uniqueToken(); private List existTaskIds = new ArrayList<>(); @@ -72,14 +72,14 @@ class V2Reroute extends BaseAction { if (null == workLog) { throw new ExceptionEntityNotExist(WorkLog.class); } - activity = business.getActivity(work); + // activity = business.getActivity(work); destinationActivity = business.getActivity(wi.getActivity(), ActivityType.valueOf(wi.getActivityType())); WoControl control = business.getControl(effectivePerson, work, WoControl.class); if (BooleanUtils.isNotTrue(control.getAllowReroute())) { throw new ExceptionRerouteDenied(effectivePerson.getDistinguishedName(), work.getTitle(), destinationActivity.getName()); } - if (!StringUtils.equals(work.getProcess(), activity.getProcess())) { + if (!StringUtils.equals(work.getProcess(), destinationActivity.getProcess())) { throw new ExceptionProcessNotMatch(); } existTaskIds = emc.idsEqual(Task.class, Task.job_FIELDNAME, work.getJob());