Merge branch 'fix/activityDescription' into 'develop_java8'

修复活动说明在撤回时没有覆盖

See merge request o2oa/o2oa!3200

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

@@ -106,7 +106,7 @@ class V2Retract extends BaseAction {
 						}
 					}
 
-					update(work, workLog);
+					update(work, workLog, activity);
 
 					// 必然不为null
 					taskCompleted.setProcessingType(TaskCompleted.PROCESSINGTYPE_RETRACT);
@@ -170,11 +170,13 @@ class V2Retract extends BaseAction {
 		return work;
 	}
 
-	private void update(Work work, WorkLog workLog) {
-		work.setActivity(workLog.getFromActivity());
-		work.setActivityAlias(workLog.getFromActivityAlias());
-		work.setActivityName(workLog.getFromActivityName());
+	private void update(Work work, WorkLog workLog, Activity activity) {
+		work.setActivity(activity.getId());
+		work.setActivityAlias(activity.getAlias());
+		work.setActivityName(activity.getName());
+		work.setActivityDescription(activity.getDescription());
 		work.setActivityToken(workLog.getFromActivityToken());
+		work.setActivityDescription(DESC);
 		work.setSplitting(workLog.getSplitting());
 		work.setSplitToken(workLog.getSplitToken());
 		work.setSplitValue(workLog.getSplitValue());