Merge branch 'cherry-pick-2cc5fd67' into 'release'

Merge branch 'fix/readCompleted_miss_applicationAlias' into 'develop'

See merge request o2oa/o2oa!904

o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/content/ReadCompleted.java

@@ -128,7 +128,7 @@ public class ReadCompleted extends SliceJpaObject implements ProjectionInterface
 		this.setTitle(read.getTitle());
 		this.application = read.getApplication();
 		this.applicationName = read.getApplicationName();
-		this.applicationAlias = this.getApplicationAlias();
+		this.applicationAlias = read.getApplicationAlias();
 		this.process = read.getProcess();
 		this.processName = read.getProcessName();
 		this.processAlias = read.getProcessAlias();

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java

@@ -623,25 +623,6 @@ public class ManualProcessor extends AbstractManualProcessor {
 		}
 	}
 
-	// private void expireScript(AeiObjects aeiObjects, Manual manual, Task task)
-	// throws Exception {
-	// ScriptContext scriptContext = aeiObjects.scriptContext();
-	// Bindings bindings = scriptContext.getBindings(ScriptContext.ENGINE_SCOPE);
-	// bindings.put(ScriptFactory.BINDING_NAME_TASK, task);
-	// Object objectValue = aeiObjects.business().element()
-	// .getCompiledScript(aeiObjects.getWork().getApplication(), manual,
-	// Business.EVENT_MANUALTASKEXPIRE)
-	// .eval(scriptContext);
-	// WorkTime wt = new WorkTime();
-	// if (NumberUtils.isCreatable(objectValue.toString())) {
-	// task.setExpireTime(wt.forwardMinutes(new Date(),
-	// NumberUtils.toInt(ScriptFactory.asString(objectValue))));
-	// } else {
-	// task.setExpireTime(null);
-	// }
-	//
-	// }
-
 	private void expireScript(AeiObjects aeiObjects, Manual manual, Task task) throws Exception {
 		ExpireScriptResult expire = new ExpireScriptResult();
 		ScriptContext scriptContext = aeiObjects.scriptContext();