fixlookup form

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

@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
 import java.util.zip.CRC32;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.vfs2.util.DelegatingFileSystemOptionsBuilder;
 
 import com.x.base.core.container.EntityManagerContainer;
 import com.x.base.core.container.factory.EntityManagerContainerFactory;
@@ -75,7 +76,7 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
 			Business business = new Business(emc);
 			WorkCompleted workCompleted = null;
 			Work work = emc.fetch(flag, Work.class, ListTools.toList(JpaObject.id_FIELDNAME, Work.form_FIELDNAME,
-					Work.activity_FIELDNAME, Work.activityType_FIELDNAME));
+					Work.activity_FIELDNAME, Work.activityType_FIELDNAME, Work.application_FIELDNAME));
 			if (null == work) {
 				workCompleted = emc.flag(flag, WorkCompleted.class);
 			}
@@ -101,8 +102,8 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
 		}
 		if (null == o) {
 			Application application = business.application().pick(work.getApplication());
-			if ((null != application) && StringUtils.isNotEmpty(application.getProperties().getDefaultForm())) {
-				o = business.form().pick(application.getProperties().getDefaultForm());
+			if ((null != application) && StringUtils.isNotEmpty(application.getDefaultForm())) {
+				o = business.form().pick(application.getDefaultForm());
 			}
 		}
 		return o;

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

@@ -27,6 +27,7 @@ import com.x.processplatform.core.entity.content.Work;
 import com.x.processplatform.core.entity.content.WorkCompleted;
 import com.x.processplatform.core.entity.content.WorkCompletedProperties.StoreForm;
 import com.x.processplatform.core.entity.element.Activity;
+import com.x.processplatform.core.entity.element.Application;
 import com.x.processplatform.core.entity.element.Form;
 import com.x.processplatform.core.entity.element.FormProperties;
 
@@ -74,18 +75,12 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
 			Business business = new Business(emc);
 			WorkCompleted workCompleted = null;
 			Work work = emc.fetch(flag, Work.class, ListTools.toList(JpaObject.id_FIELDNAME, Work.form_FIELDNAME,
-					Work.activity_FIELDNAME, Work.activityType_FIELDNAME));
+					Work.activity_FIELDNAME, Work.activityType_FIELDNAME, Work.application_FIELDNAME));
 			if (null == work) {
 				workCompleted = emc.flag(flag, WorkCompleted.class);
 			}
 			if (null != work) {
-				this.form = business.form().pick(work.getForm());
-				if (null == this.form) {
-					Activity activity = business.getActivity(work);
-					if (null != activity) {
-						this.form = business.form().pick(activity.getForm());
-					}
-				}
+				this.form = getFormWithWork(business, work);
 			} else if (null != workCompleted) {
 				this.form = business.form().pick(workCompleted.getForm());
 				if (null == this.form) {
@@ -96,6 +91,23 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
 		}
 	}
 
+	private Form getFormWithWork(Business business, Work work) throws Exception {
+		Form o = business.form().pick(work.getForm());
+		if (null == o) {
+			Activity activity = business.getActivity(work);
+			if (null != activity) {
+				o = business.form().pick(activity.getForm());
+			}
+		}
+		if (null == o) {
+			Application application = business.application().pick(work.getApplication());
+			if ((null != application) && StringUtils.isNotEmpty(application.getDefaultForm())) {
+				o = business.form().pick(application.getDefaultForm());
+			}
+		}
+		return o;
+	}
+
 	private CompletableFuture<List<String>> relatedFormFuture(FormProperties properties) {
 		return CompletableFuture.supplyAsync(() -> {
 			List<String> list = new ArrayList<>();