Просмотр исходного кода

1、修复草稿启动流程未判断多版本的问题

o2sword 5 лет назад
Родитель
Сommit
32e9c7e633

+ 1 - 1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/factory/element/ProcessFactory.java

@@ -91,7 +91,7 @@ public class ProcessFactory extends ElementFactory {
 			return null;
 			return null;
 		}
 		}
 		Process o = null;
 		Process o = null;
-		String cacheKey = ApplicationCache.concreteCacheKey(application, edition);
+		String cacheKey = ApplicationCache.concreteCacheKey(application, "e:" + edition);
 		Element element = cache.get(cacheKey);
 		Element element = cache.get(cacheKey);
 		if (null != element) {
 		if (null != element) {
 			if (null != element.getObjectValue()) {
 			if (null != element.getObjectValue()) {

+ 5 - 0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/draft/ActionStart.java

@@ -17,6 +17,8 @@ import com.x.processplatform.core.entity.content.Draft;
 import com.x.processplatform.core.entity.element.Application;
 import com.x.processplatform.core.entity.element.Application;
 import com.x.processplatform.core.entity.element.Process;
 import com.x.processplatform.core.entity.element.Process;
 import com.x.processplatform.core.express.assemble.surface.jaxrs.work.ActionCreateWi;
 import com.x.processplatform.core.express.assemble.surface.jaxrs.work.ActionCreateWi;
+import org.apache.commons.lang3.BooleanUtils;
+import org.apache.commons.lang3.StringUtils;
 
 
 class ActionStart extends BaseAction {
 class ActionStart extends BaseAction {
 
 
@@ -42,6 +44,9 @@ class ActionStart extends BaseAction {
 			if (null == process) {
 			if (null == process) {
 				throw new ExceptionEntityNotExist(draft.getProcess(), Process.class);
 				throw new ExceptionEntityNotExist(draft.getProcess(), Process.class);
 			}
 			}
+			if(StringUtils.isNotEmpty(process.getEdition()) && BooleanUtils.isFalse(process.getEditionEnable())){
+				process = business.process().pickEnabled(process.getApplication(), process.getEdition());
+			}
 
 
 		}
 		}
 		ActionCreateWi req = new ActionCreateWi();
 		ActionCreateWi req = new ActionCreateWi();