From 33b7df09c9ba20fe71f453b5049a0c8c591de61c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 3 Apr 2018 10:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=B9=E9=85=8D=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=EF=BC=8C=E5=88=86=E7=B1=BB=E5=9C=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/MultipleCfgController.java  |  2 ++
 .../configuration/MultipleCfgService.java     |  1 -
 .../webapp/WEB-INF/include/form/basicInfo.jsp |  8 +------
 .../WEB-INF/include/form/complexInfo.jsp      |  6 +++++-
 .../include/form/multiple/basicInfo.jsp       |  9 +-------
 .../include/form/multiple/complexInfo.jsp     | 21 +++++++++++++++++--
 .../WEB-INF/views/cfg/multipleCfgForm.jsp     | 15 +++++++++----
 7 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
index 6ef86fd4c..3fc45f3f4 100644
--- a/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/MultipleCfgController.java
@@ -573,6 +573,8 @@ public class MultipleCfgController extends BaseController{
 						this.setPropertiesToMultipleCfg(resultCfg, resultComplexCfg,"update");
 					}
 				}
+				List<SysDictInfo> districts=sysDictInfoService.getDistrictDict(tableName);
+				model.addAttribute("districts", districts);
 			}
 		}
 			model.addAttribute("_cfg", resultCfg);
diff --git a/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java b/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java
index b0c17840e..5dab64ead 100644
--- a/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MultipleCfgService.java
@@ -158,7 +158,6 @@ public class MultipleCfgService extends CrudService<MultipleCfgDao,MultipleSearc
 				should+=cfg.getIpCfg().size();
 			}
 		int result=0;
-		if(cfg==null) return false;
 		if(Constants.AUDIT_YES==cfg.getIsAudit()||Constants.AUDIT_NOT_YES==cfg.getIsAudit()){
 			List<BaseCfg> cfgs=new ArrayList<BaseCfg>();
 			if(sendCfg.getIpCfg()!=null){
diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index a464d89c9..5531d927f 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -31,19 +31,13 @@
                			<c:when test="${_cfg.classify==null or _cfg.classify==''}">
                				<option value="${fl.serviceDictId}">${fl.itemValue}</option>
                			</c:when>
-               			<c:when test="${fn:contains(_cfg.classify,',')}">
+               			<c:otherwise>
                			<option value="${fl.serviceDictId}"
                				<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
 		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
 		               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
                				</c:forEach>
                			>${fl.itemValue}</option>	
-               			</c:when>
-               			<c:otherwise>
-               				<option value="${fl.serviceDictId}"
-		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
-		               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
-		               			>${fl.itemValue}</option>
                			</c:otherwise>
                		</c:choose>
                	</c:forEach>
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index ba8b76628..1ccb46e35 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -87,14 +87,18 @@
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
+            			<c:if test="${action==2}">disabled</c:if>
             		><spring:message code="yes"/>
             	</label>
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="0"
             			<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
+            			<c:if test="${action==2}">disabled</c:if>
             		><spring:message code="no"/>
             	</label>
-                <%-- <input class="form-control" type="text" name="isAreaEffective" value="${_cfg.isAreaEffective}"> --%>
+            	<c:if test="${action==2}">
+				<input class="form-control" type="hidden" name="isAreaEffective" value="${_cfg.isAreaEffective}">
+				</c:if>
             </div>
             <div for="isAreaEffective"></div>
         </div>
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp
index 21a3995d3..6ab3cf775 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/basicInfo.jsp
@@ -53,25 +53,18 @@
            <label class="control-label col-md-3"><spring:message code="type"/></label>
            <div class="col-md-6">
            	 <select name="classify" multiple class="selectpicker form-control" title=<spring:message code="select"/>>
-               	
                	<c:forEach items="${fls}" var="fl">
                		<c:choose>
                			<c:when test="${_cfg.classify==null or _cfg.classify==''}">
                				<option value="${fl.serviceDictId}">${fl.itemValue}</option>
                			</c:when>
-               			<c:when test="${fn:contains(_cfg.classify,',')}">
+               			<c:otherwise>
                			<option value="${fl.serviceDictId}"
                				<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
 		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
 		               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
                				</c:forEach>
                			>${fl.itemValue}</option>	
-               			</c:when>
-               			<c:otherwise>
-               				<option value="${fl.serviceDictId}"
-		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
-		               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
-		               			>${fl.itemValue}</option>
                			</c:otherwise>
                		</c:choose>
                	</c:forEach>
diff --git a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
index e8e412df9..c9e6beff6 100644
--- a/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/multiple/complexInfo.jsp
@@ -1,5 +1,18 @@
 <%@ page contentType="text/html;charset=UTF-8"%>
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
+<script type="text/javascript">
+$(function(){
+	if(!$(".district").val()&&$(".otherValue").val()){
+		$(".district").find("option").each(function(){
+			var text=$(this).text().toLowerCase();
+			if("others"==text){
+				$(this).attr("selected","selected");
+				$(this).parent().siblings(".otherValue").prop("type","text");
+			}
+		});
+	}
+})
+</script>
 <h3 class="form-section">增强字符串<spring:message code="block_config"/><!-- <small><span class="glyphicon glyphicon-chevron-down" data-toggle="collapse" data-target=".complexCfg" title="add"></span></small> --></h3>
 <div class="row complexCfg">
     <div class="col-md-6">
@@ -26,7 +39,9 @@
            				<select name="complexCfg[${mainTable}].district" class="district selectpicker select2 form-control">
            					<option value=""><spring:message code='select'/></option>
            					<c:forEach items="${districts}" var="district">
-           						<option value="${district.itemValue}">${district.itemValue}</option>
+           						<option value="${district.itemValue}"
+           						<c:if test="${_cfg.complexCfg[mainTable].district eq district.itemValue}">selected</c:if>
+           						>${district.itemValue}</option>
            					</c:forEach>
            				</select>
             		</c:when>
@@ -34,7 +49,9 @@
             			<select name="complexCfg[${otherTable.tableName}].district" class="district selectpicker select2 form-control">
            					<option value=""><spring:message code='select'/></option>
            					<c:forEach items="${districts}" var="district">
-           						<option value="${district.itemValue}">${district.itemValue}</option>
+           						<option value="${district.itemValue}"
+           						<c:if test="${_cfg.complexCfg[otherTable.tableName].district eq district.itemValue}">selected</c:if>
+           						>${district.itemValue}</option>
            					</c:forEach>
            				</select>
             		</c:when>
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index 36990a4e8..9818bb0d8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -153,11 +153,18 @@ $(function(){
 		}
 	});
 	$(".district").on("change",function(){
-		var val=$(this).val().toLowerCase();
-		if("others"==val){
-			$(this).parent("div").siblings(".otherValue").prop("type","text");
+		var text=$(this).find("option:selected").text().toLowerCase();
+		var other=$(this).parent("div").siblings(".otherValue");
+		if("others"==text){
+			other.prop("type","text");
+			$(this).find("option").each(function(){
+				if(other.val()==$(this).text()){
+					other.val("");
+					return false;
+				}
+			});
 		}else{
-			$(this).parent("div").siblings(".otherValue").prop("type","hidden").attr("value","");
+			other.prop("type","hidden");
 		}
 	});
 	$(".otherValue").on("change",function(){