diff --git a/portal-manager/pom.xml b/portal-manager/pom.xml index 910e2462e948933076c9beb7ea3567135b7fef9e..4995a85cd231c1115f59ef740973bd8b0de910e2 100644 --- a/portal-manager/pom.xml +++ b/portal-manager/pom.xml @@ -54,7 +54,7 @@ <profiles.log.level>INFO</profiles.log.level> <profiles.log.path>/home/mortals/app/logs</profiles.log.path> <package.environment>test</package.environment> - <skipUi>false</skipUi> + <skipUi>true</skipUi> </properties> </profile> @@ -116,7 +116,7 @@ <profiles.log.level>INFO</profiles.log.level> <profiles.log.path>/home/mortals/app/logs</profiles.log.path> <package.environment>yibin</package.environment> - <skipUi>false</skipUi> + <skipUi>true</skipUi> </properties> </profile> @@ -354,7 +354,7 @@ <configuration> <skipAssembly>${skipUi}</skipAssembly> <finalName>${project.artifactId}-ui</finalName> - <appendAssemblyId>true</appendAssemblyId> + <appendAssemblyId>false</appendAssemblyId> <descriptors> <descriptor>./assembly/assembly-manager-ui.xml</descriptor> </descriptors> diff --git a/portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageInfoServiceImpl.java b/portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageInfoServiceImpl.java index a1e2abc0c4b80e5327191d6081584b48b34c8ec2..a0cc00322a4c3067735a70461784fcf3ce5b5772 100644 --- a/portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageInfoServiceImpl.java +++ b/portal-manager/src/main/java/com/mortals/xhx/module/page/service/impl/PageInfoServiceImpl.java @@ -67,7 +67,9 @@ public class PageInfoServiceImpl extends AbstractCRUDServiceImpl<PageInfoDao, Pa doSaveImageBase64(entity,pageInfoEntity.getScreenUrl()); PageInfoEntity updateEntity = new PageInfoEntity(); updateEntity.setId(pageInfoEntity.getId()); - updateEntity.setScreenUrl(pageInfoEntity.getScreenUrl()); + if(StringUtils.isNotEmpty(pageInfoEntity.getScreenUrl())) { + updateEntity.setScreenUrl(pageInfoEntity.getScreenUrl()); + } updateEntity.setUpdateTime(new Date()); int iRet = this.dao.update(updateEntity); if (iRet == 0) {