Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

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>

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) {