Merge branch 'fix/addWork' into 'wrdp'

加回老版本getWorkOrWorkCompleted的work返回值

See merge request o2oa/o2oa!2388

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/ActionGetWithWorkOrWorkCompleted.java

@@ -64,12 +64,14 @@ class ActionGetWithWorkOrWorkCompleted extends BaseAction {
 			wo.setReadList(readFuture.get(10, TimeUnit.SECONDS));
 			this.setCurrentReadIndex(effectivePerson, wo);
 			this.setCurrentTaskIndex(effectivePerson, wo);
+			wo.setWork(gson.toJsonTree(work));
 		} else if (null != workCompleted) {
 			CompletableFuture<Data> dataFuture = this.dataFuture(workCompleted);
 			CompletableFuture<List<WoRead>> readFuture = this.readFuture(workCompleted.getJob());
 			wo.setData(dataFuture.get(10, TimeUnit.SECONDS));
 			wo.setReadList(readFuture.get(10, TimeUnit.SECONDS));
 			this.setCurrentReadIndex(effectivePerson, wo);
+			wo.setWork(gson.toJsonTree(workCompleted));
 		}
 
 		if (BooleanUtils.isFalse(checkControlFuture.get(10, TimeUnit.SECONDS))) {