Merge branch 'feature/index' into 'develop'

修正表单获取

See merge request o2oa/o2oa!1258

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Reroute.java

@@ -98,7 +98,10 @@ class V2Reroute extends BaseAction {
 				emc.beginTransaction(Read.class);
 				emc.beginTransaction(WorkLog.class);
 				// 重新设置表单
-				work.setForm(business.element().lookupSuitableForm(work.getProcess(), activity.getId()));
+				String formId =business.element().lookupSuitableForm(work.getProcess(), activity.getId()); 
+				if (StringUtils.isNotBlank(formId)) {
+				    work.setForm(formId);				    
+				}
 				// 调度强制把这个标志设置为true,这样可以避免在拟稿状态就调度,系统认为是拟稿状态,默认不创建待办.
 				work.setWorkThroughManual(true);
 				work.setDestinationActivity(activity.getId());

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2Rollback.java

@@ -162,7 +162,11 @@ class V2Rollback extends BaseAction {
 		work.setSplitting(workLog.getSplitting());
 		work.setSplitToken(workLog.getSplitToken());
 		work.setSplitValue(workLog.getSplitValue());
-		work.setForm(business.element().lookupSuitableForm(work.getProcess(), work.getActivity()));
+	      // 重新设置表单
+        String formId =business.element().lookupSuitableForm(work.getProcess(), work.getActivity()); 
+        if (StringUtils.isNotBlank(formId)) {
+            work.setForm(formId);                   
+        }
 		workLog.setConnected(false);
 		workLog.setArrivedActivity("");
 		workLog.setArrivedActivityAlias("");

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/workcompleted/ActionRollback.java

@@ -173,7 +173,10 @@ class ActionRollback extends BaseAction {
 		work.setActivityDescription("");
 		work.setActivityToken(workLog.getFromActivityToken());
 		work.setActivityType(workLog.getFromActivityType());
-		work.setForm(business.element().lookupSuitableForm(work.getProcess(), work.getActivity()));
+		String formId =business.element().lookupSuitableForm(work.getProcess(), work.getActivity()); 
+        if (StringUtils.isNotBlank(formId)) {
+            work.setForm(formId);                   
+        }
 //		work.setErrorRetry(0);
 		work.setWorkStatus(WorkStatus.processing);
 		// 因为workCompleted没有workCreateType属性，回溯到任何环节都必须要有待办，默认置为assign