Merge branch 'fix/应用中心导入应用本身信息不覆盖' into 'wrdp'

【应用中心】修复导入应用覆盖时应用本身信息没有覆盖的问题

See merge request o2oa/o2oa!1845

o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/input/ActionCover.java

@@ -59,6 +59,10 @@ class ActionCover extends BaseAction {
 			appInfo.setAppName(this.idleAppInfoName(business, appInfo.getAppName(), appInfo.getId()));
 			appInfo.setAppAlias(this.idleAppInfoAlias(business, appInfo.getAppAlias(), appInfo.getId()));
 			persistObjects.add(appInfo);
+		}else{
+			WrapCms.inCopier.copy(wi, appInfo);
+			appInfo.setAppName(this.idleAppInfoName(business, appInfo.getAppName(), appInfo.getId()));
+			appInfo.setAppAlias(this.idleAppInfoAlias(business, appInfo.getAppAlias(), appInfo.getId()));
 		}
 
 		//2020年1月16日 O2LEE 保存栏目信息对应的配置支持信息JSON ---->start

o2server/x_portal_assemble_designer/src/main/java/com/x/portal/assemble/designer/jaxrs/input/ActionCover.java

@@ -64,7 +64,13 @@ class ActionCover extends BaseAction {
 			portal.setName(this.idlePortalName(business, portal.getName(), portal.getId()));
 			portal.setAlias(this.idlePortalAlias(business, portal.getAlias(), portal.getId()));
 			persistObjects.add(portal);
-		}else if (!business.editable(effectivePerson, portal)) {
+		}else{
+			WrapPortal.inCopier.copy(wi, portal);
+			portal.setName(this.idlePortalName(business, portal.getName(), portal.getId()));
+			portal.setAlias(this.idlePortalAlias(business, portal.getAlias(), portal.getId()));
+		}
+
+		if (!business.editable(effectivePerson, portal)) {
 			throw new ExceptionPortalAccessDenied(effectivePerson.getName(), portal.getName(), portal.getId());
 		}
 

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

@@ -104,7 +104,12 @@ class ActionCover extends BaseAction {
 			application.setName(this.idleApplicationName(business, application.getName(), application.getId()));
 			application.setAlias(this.idleApplicationAlias(business, application.getAlias(), application.getId()));
 			persistObjects.add(application);
-		}else if (!business.editable(effectivePerson, application)) {
+		}else{
+			WrapProcessPlatform.inCopier.copy(wi, application);
+			application.setName(this.idleApplicationName(business, application.getName(), application.getId()));
+			application.setAlias(this.idleApplicationAlias(business, application.getAlias(), application.getId()));
+		}
+		if (!business.editable(effectivePerson, application)) {
 			throw new ExceptionApplicationAccessDenied(effectivePerson.getName(), application.getName(),
 					application.getId());
 		}

o2server/x_query_assemble_designer/src/main/java/com/x/query/assemble/designer/jaxrs/input/ActionCover.java

@@ -61,10 +61,14 @@ class ActionCover extends BaseAction {
 			query.setName(this.idleQueryName(business, query.getName(), query.getId()));
 			query.setAlias(this.idleQueryAlias(business, query.getAlias(), query.getId()));
 			persistObjects.add(query);
-		}else if (!business.editable(effectivePerson, query)) {
+		}else {
+			WrapQuery.inCopier.copy(wi, query);
+			query.setName(this.idleQueryName(business, query.getName(), query.getId()));
+			query.setAlias(this.idleQueryAlias(business, query.getAlias(), query.getId()));
+		}
+		if (!business.editable(effectivePerson, query)) {
 			throw new ExceptionQueryAccessDenied(effectivePerson.getName(), query.getName(), query.getId());
 		}
-
 		for (WrapView _o : wi.getViewList()) {
 			View obj = business.entityManagerContainer().find(_o.getId(), View.class);
 			if (null != obj) {