Merge branch 'feature/#444' into 'project/cb-yjs'

添加待办转已办必须填写路由选择

See merge request o2oa/o2oa!2609

(cherry picked from commit e615860db6e3ce64c282c05ad0909a7ce08d14e5)

47d441d6 添加待办转已办必须填写路由选择

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ActionProcessing.java

@@ -192,6 +192,14 @@ class ActionProcessing extends BaseAction {
 			this.task.setMediaOpinion(this.wi.getMediaOpinion());
 			business.entityManagerContainer().commit();
 		}
+		// 校验路由选择不能为空
+		if (StringUtils.isBlank(this.task.getRouteName())) {
+			throw new ExceptionEmptyRouteName();
+		}
+		// 校验路由在可选择范围内
+		if (!this.task.getRouteNameList().contains(this.task.getRouteName())) {
+			throw new ExceptionErrorRouteName(this.task.getRouteName());
+		}
 	}
 
 	private void seeManualRoute(Business business) throws Exception {

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ExceptionEmptyRouteName.java

+package com.x.processplatform.assemble.surface.jaxrs.task;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionEmptyRouteName extends PromptException {
+
+	private static final long serialVersionUID = 1040883405179987063L;
+
+	ExceptionEmptyRouteName() {
+		super("路由选择不能为空.");
+	}
+}

o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/ExceptionErrorRouteName.java

+package com.x.processplatform.assemble.surface.jaxrs.task;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionErrorRouteName extends PromptException {
+
+	private static final long serialVersionUID = 1040883405179987063L;
+
+	ExceptionErrorRouteName(String routeName) {
+		super("路由选择错误:{}.", routeName);
+	}
+}