Merge branch 'fix/多版本流程导入后版本列示展现为空' into 'release'

Merge of fix/[流程平台]多版本流程导入后版本列示展现为空 to release

See merge request o2oa/o2oa!375

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/input/ActionCover.java

@@ -95,14 +95,14 @@ class ActionCover extends BaseAction {
 				throw new ExceptionApplicationAccessDenied(effectivePerson.getName(), application.getName(),
 						application.getId());
 			}
-			this.cover(business, wi, application);
+			this.cover(business, wi, application, effectivePerson);
 			wo.setId(application.getId());
 			result.setData(wo);
 			return result;
 		}
 	}
 
-	private void cover(Business business, Wi wi, Application application) throws Exception {
+	private void cover(Business business, Wi wi, Application application, EffectivePerson effectivePerson) throws Exception {
 		List<JpaObject> persistObjects = new ArrayList<>();
 		List<JpaObject> removeObjects = new ArrayList<>();
 		for (WrapForm _o : wi.getFormList()) {
@@ -210,13 +210,14 @@ class ActionCover extends BaseAction {
 				process.setName(this.idleNameWithApplication(business, application.getId(), process.getName(),
 						Process.class, process.getId()));
 			}
+			process.setLastUpdatePerson(effectivePerson.getDistinguishedName());
+			process.setLastUpdateTime(new Date());
 			process.setApplication(application.getId());
 			if (StringUtils.isNotEmpty(process.getEdition())) {
 				if(BooleanUtils.isTrue(process.getEditionEnable())) {
 					for (Process p : business.entityManagerContainer().listEqualAndEqual(Process.class, Process.application_FIELDNAME,
 							process.getApplication(), Process.edition_FIELDNAME, process.getEdition())) {
 						if (!process.getId().equals(p.getId()) && BooleanUtils.isTrue(p.getEditionEnable())) {
-							p.setLastUpdateTime(new Date());
 							p.setEditionEnable(false);
 						}
 					}

o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/input/ActionCreate.java

@@ -77,14 +77,14 @@ class ActionCreate extends BaseAction {
 			if (!business.editable(effectivePerson, null)) {
 				throw new ExceptionApplicationAccessDenied(effectivePerson.getName(), wi.getName(), wi.getId());
 			}
-			Application application = this.create(business, wi);
+			Application application = this.create(business, wi, effectivePerson);
 			wo.setId(application.getId());
 			result.setData(wo);
 			return result;
 		}
 	}
 
-	private Application create(Business business, Wi wi) throws Exception {
+	private Application create(Business business, Wi wi, EffectivePerson effectivePerson) throws Exception {
 		List<JpaObject> persistObjects = new ArrayList<>();
 		Application application = business.entityManagerContainer().find(wi.getId(), Application.class);
 		if (null != application) {
@@ -154,6 +154,8 @@ class ActionCreate extends BaseAction {
 				throw new ExceptionEntityExistForCreate(wrapProcess.getId(), Process.class);
 			}
 			process = WrapProcess.inCopier.copy(wrapProcess);
+			process.setLastUpdatePerson(effectivePerson.getDistinguishedName());
+			process.setLastUpdateTime(new Date());
 			process.setApplication(application.getId());
 			persistObjects.add(process);
 			if (StringUtils.isNotEmpty(process.getEdition())) {
@@ -161,7 +163,6 @@ class ActionCreate extends BaseAction {
 					for (Process p : business.entityManagerContainer().listEqualAndEqual(Process.class, Process.application_FIELDNAME,
 							process.getApplication(), Process.edition_FIELDNAME, process.getEdition())) {
 						if (!process.getId().equals(p.getId()) && BooleanUtils.isTrue(p.getEditionEnable())) {
-							p.setLastUpdateTime(new Date());
 							p.setEditionEnable(false);
 						}
 					}