Merge branch 'fix/loadform' into 'develop'

修正getForm时无设置表单的判断错误.

See merge request o2oa/o2oa!634

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

@@ -64,12 +64,14 @@ class ActionGetWithWorkOrWorkCompleted extends BaseAction {
 		}
 		if (StringUtils.isNotEmpty(id)) {
 			Form form = business.form().pick(id);
-			wo = WoWorkForm.copier.copy(form);
-			if (StringUtils.isEmpty(wo.getData())) {
-				wo.setData(wo.getMobileData());
+			if (null != form) {
+				wo = WoWorkForm.copier.copy(form);
+				if (StringUtils.isEmpty(wo.getData()) && StringUtils.isNotEmpty(wo.getMobileData())) {
+					wo.setData(wo.getMobileData());
+				}
+				/* 清空移动端表单,减少传输量 */
+				wo.setMobileData("");
 			}
-			/* 清空移动端表单,减少传输量 */
-			wo.setMobileData("");
 		}
 		return wo;
 	}
@@ -91,21 +93,21 @@ class ActionGetWithWorkOrWorkCompleted extends BaseAction {
 		} else if (StringUtils.isNotEmpty(workCompleted.getFormMobileData())) {
 			wo.setData(workCompleted.getFormMobileData());
 		}
-//		WoWorkCompletedForm wo = new WoWorkCompletedForm();
-//		if (StringUtils.isNotEmpty(workCompleted.getFormData())) {
-//			wo.setData(workCompleted.getFormData());
-//		} else if (StringUtils.isNotEmpty(workCompleted.getFormMobileData())) {
-//			wo.setData(workCompleted.getFormMobileData());
-//		} else if (StringUtils.isNotEmpty(workCompleted.getForm())) {
-//			Form form = business.form().pick(workCompleted.getForm());
-//			if (null != form) {
-//				if (StringUtils.isNotEmpty(form.getData())) {
-//					wo.setData(form.getData());
-//				} else if (StringUtils.isNotEmpty(form.getMobileData())) {
-//					wo.setData(workCompleted.getFormMobileData());
-//				}
-//			}
-//		}
+		// WoWorkCompletedForm wo = new WoWorkCompletedForm();
+		// if (StringUtils.isNotEmpty(workCompleted.getFormData())) {
+		// wo.setData(workCompleted.getFormData());
+		// } else if (StringUtils.isNotEmpty(workCompleted.getFormMobileData())) {
+		// wo.setData(workCompleted.getFormMobileData());
+		// } else if (StringUtils.isNotEmpty(workCompleted.getForm())) {
+		// Form form = business.form().pick(workCompleted.getForm());
+		// if (null != form) {
+		// if (StringUtils.isNotEmpty(form.getData())) {
+		// wo.setData(form.getData());
+		// } else if (StringUtils.isNotEmpty(form.getMobileData())) {
+		// wo.setData(workCompleted.getFormMobileData());
+		// }
+		// }
+		// }
 		return wo;
 	}
 

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

@@ -65,12 +65,14 @@ class ActionGetWithWorkOrWorkCompletedMobile extends BaseAction {
 		}
 		if (StringUtils.isNotEmpty(id)) {
 			Form form = business.form().pick(id);
-			wo = WoWorkForm.copier.copy(form);
-			if (StringUtils.isNotEmpty(wo.getMobileData())) {
-				wo.setData(wo.getMobileData());
+			if (null != form) {
+				wo = WoWorkForm.copier.copy(form);
+				if (StringUtils.isNotEmpty(wo.getMobileData())) {
+					wo.setData(wo.getMobileData());
+				}
+				/* 清空移动端表单,减少传输量 */
+				wo.setMobileData("");
 			}
-			/* 清空移动端表单,减少传输量 */
-			wo.setMobileData("");
 		}
 		return wo;
 	}