From e70e7007fc667a1b58ff47ecf30b8a83bd470199 Mon Sep 17 00:00:00 2001
From: zhanghongqing <13664257052@163.com>
Date: Tue, 9 Oct 2018 09:44:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3app=E7=89=B9=E5=BE=81?=
 =?UTF-8?q?=E4=B8=AD=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9=E6=97=B6=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/AppMultiFeatureCfgService.java    | 4 ++++
 .../webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
index 6a93aa6f0..a7a3fbac9 100644
--- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
@@ -121,14 +121,18 @@ public class AppMultiFeatureCfgService extends BaseService {
 			}
 			if(entity.getStrList()!=null){
 				for(AppStringFeatureCfg cfg:entity.getStrList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
 					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
 					appMultiFeatureCfgDao.insertAppStringFeatureCfg(cfg);
+					}
 				}
 			}
 			if(entity.getComplexList()!=null){
 				for(AppComplexFeatureCfg cfg:entity.getComplexList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
 					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
 					appMultiFeatureCfgDao.insertAppComplexFeatureCfg(cfg);
+					}
 				}
 			}
 		}
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp
index c612de0b6..8175767d2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp
@@ -271,8 +271,10 @@ var delContent = function(contentClassName, addBtnClassName) {
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div
-														class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<input type="hidden" name="cfgRegionValue" value="${region.configRegionValue }">
+														<input type="hidden" name="cfgRegionType" value="${region.regionType }">
+														<input type="hidden" name="cfgRegionCode1" value="${region.configRegionCode }">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="complexCfgIndex" value="${complexCfgIndex+1 }"></c:set>