Merge branch 'cherry-pick-f3608f7f' into 'project/chinamobile-设计院-2021-1-18'

Merge branch 'fix/empower' into 'project/chinamobile-重庆移动'

See merge request o2oa/o2oa!2921

(cherry picked from commit d2ceffc93625fb21ffb68159a0691fb30e91138d)

fff9172a Merge branch 'fix/empower' into 'project/chinamobile-重庆移动'

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

@@ -91,6 +91,8 @@ public class Work extends SliceJpaObject implements ProjectionInterface {
 			text = StringTools.utf8SubString(text, length_255B);
 			this.setManualTaskIdentityText(text);
 		}
+		// 强制进行properties对象写入
+		//this.setProperties(this.getProperties());
 	}
 
 	@PostLoad

o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionAppend.java

@@ -11,6 +11,7 @@ import javax.script.ScriptContext;
 import javax.script.SimpleScriptContext;
 
 import org.apache.commons.collections4.ListUtils;
+import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import com.google.gson.JsonElement;
@@ -40,6 +41,7 @@ import com.x.processplatform.service.processing.ThisApplication;
 import com.x.processplatform.service.processing.WorkContext;
 import com.x.processplatform.service.processing.WorkDataHelper;
 import com.x.processplatform.service.processing.processor.manual.TaskIdentities;
+import com.x.processplatform.service.processing.processor.manual.TaskIdentity;
 
 class ActionAppend extends BaseAction {
 
@@ -132,6 +134,13 @@ class ActionAppend extends BaseAction {
 						identities = business.organization().identity().list(ListTools.trim(identities, true, true));
 						emc.beginTransaction(Work.class);
 						work.setManualTaskIdentityList(identities);
+						for (TaskIdentity taskIdentity : taskIdentities) {
+							if (BooleanUtils.isNotTrue(taskIdentity.getIgnoreEmpower())
+									&& StringUtils.isNotEmpty(taskIdentity.getFromIdentity())) {
+								work.getProperties().getManualEmpowerMap().put(taskIdentity.getIdentity(),
+										taskIdentity.getFromIdentity());
+							}
+						}
 						// 转派后设置过期为空
 //						emc.beginTransaction(Task.class);
 //						task.setExpired(false);