退回getForm

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java

@@ -48,14 +48,8 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
 			if (optional.isPresent()) {
 				this.wo = (Wo) optional.get();
 			} else {
-				// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值.
-				try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-					this.form = emc.find(form.getId(), Form.class);
-				}
-				if (null != this.form) {
 				List<String> list = new ArrayList<>();
-					CompletableFuture<List<String>> relatedFormFuture = this
-							.relatedFormFuture(this.form.getProperties());
+				CompletableFuture<List<String>> relatedFormFuture = this.relatedFormFuture(this.form.getProperties());
 				CompletableFuture<List<String>> relatedScriptFuture = this
 						.relatedScriptFuture(this.form.getProperties());
 				list.add(this.form.getId() + this.form.getUpdateTime().getTime());
@@ -69,7 +63,6 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
 				CacheManager.put(cacheCategory, cacheKey, wo);
 			}
 		}
-		}
 		result.setData(wo);
 		return result;
 	}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java

@@ -48,14 +48,8 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
 			if (optional.isPresent()) {
 				this.wo = (Wo) optional.get();
 			} else {
-				// 必须重新取出,因为getWorkWorkCompletedForm的form是从缓存中取出,关联值是老的,要重新计算etag需要重新获取更新后的值.
-				try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
-					this.form = emc.find(form.getId(), Form.class);
-				}
-				if (null != this.form) {
 				List<String> list = new ArrayList<>();
-					CompletableFuture<List<String>> relatedFormFuture = this
-							.relatedFormFuture(this.form.getProperties());
+				CompletableFuture<List<String>> relatedFormFuture = this.relatedFormFuture(this.form.getProperties());
 				CompletableFuture<List<String>> relatedScriptFuture = this
 						.relatedScriptFuture(this.form.getProperties());
 				list.add(this.form.getId() + this.form.getUpdateTime().getTime());
@@ -69,7 +63,6 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
 				CacheManager.put(cacheCategory, cacheKey, wo);
 			}
 		}
-		}
 		result.setData(wo);
 		return result;
 	}