From 1e864b761ffd8acb72604ebdaffe7d517a3ce4b9 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 30 Jul 2018 16:36:29 +0800
Subject: [PATCH] =?UTF-8?q?IP=20REUSE=20POLICY=20Group=20Name=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAGroup=20=E9=9D=9E=E7=A9=BA=20=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E6=A0=87=E8=AF=86=E5=88=A0=E9=99=A4=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?bug=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/sys/DictController.java    | 25 +++++++++----------
 src/main/java/com/nis/web/dao/SysDictDao.xml  |  1 -
 .../WEB-INF/views/cfg/common/ipForm.jsp       |  5 ++--
 .../WEB-INF/views/cfg/common/ipList.jsp       |  2 +-
 .../cfg/maintenance/ipMultiplexPool/list.jsp  |  4 +--
 .../webapp/WEB-INF/views/sys/dictForm.jsp     |  1 -
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/sys/DictController.java b/src/main/java/com/nis/web/controller/sys/DictController.java
index 833261737..53fd00d7f 100644
--- a/src/main/java/com/nis/web/controller/sys/DictController.java
+++ b/src/main/java/com/nis/web/controller/sys/DictController.java
@@ -23,24 +23,17 @@ import com.nis.web.controller.BaseController;
 @RequestMapping(value = "${adminPath}/sys/dict")
 public class DictController extends BaseController {
 	
-
-	@ModelAttribute
-	public SysDataDictionaryName get(@RequestParam(required=false) Integer id) {
-		if (!StringUtil.isEmpty(id)){
-			return dictService.getDictByIdWithRelation(id);
-		}else{
-			return new SysDataDictionaryName();
-		}
-		
-		
-	}
 	
 	@RequiresPermissions("sys:dict:view")
 	@RequestMapping(value = {"list", ""})
 	public String list(SysDataDictionaryName sysDictName,HttpServletRequest request, HttpServletResponse response, Model model) {
+		if(sysDictName ==null){
+			sysDictName=new SysDataDictionaryName();
+		}
 		
 		Page<SysDataDictionaryName> page = dictService.findDictList(new Page<SysDataDictionaryName>(request, response), sysDictName);
         model.addAttribute("page", page);
+        model.addAttribute("sysDataDictionaryName",sysDictName);
        
 		return "/sys/dictList";
 	}
@@ -54,8 +47,14 @@ public class DictController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value={"form"})
-	public String form(SysDataDictionaryName sysDictName, Model model) {
-		
+	public String form(@RequestParam(required=false) Integer id, Model model) {
+		SysDataDictionaryName sysDictName=null;
+		if (!StringUtil.isEmpty(id)){
+			sysDictName= dictService.getDictByIdWithRelation(id);
+		}else{
+			sysDictName=new SysDataDictionaryName();
+		}
+		model.addAttribute("sysDataDictionaryName",sysDictName);
 		return "/sys/dictForm";
 	}
 	
diff --git a/src/main/java/com/nis/web/dao/SysDictDao.xml b/src/main/java/com/nis/web/dao/SysDictDao.xml
index 0d96f59b0..70fc29efa 100644
--- a/src/main/java/com/nis/web/dao/SysDictDao.xml
+++ b/src/main/java/com/nis/web/dao/SysDictDao.xml
@@ -145,7 +145,6 @@
       mark = #{mark,jdbcType=VARCHAR},
       remark = #{remark,jdbcType=VARCHAR},
       revision = #{revision,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP},
       modify_time = #{modifyTime,jdbcType=TIMESTAMP},
       status = #{status,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
index 291964ef9..a9a86679e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
@@ -166,10 +166,11 @@ $(function(){
 	           			   		<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="group"/></label>
 								            <div class="col-md-6">
 								            	<select id="dnsStrategyId" name="dnsStrategyId" class="selectpicker show-tick form-control required">
-					               					<c:forEach items="${policyGroups }" var="policyGroup">
+				               						<option value="" <c:if test="${empty _cfg.dnsStrategyId }">selected</c:if>><spring:message code="select"/></option>
+				               						<c:forEach items="${policyGroups }" var="policyGroup">
 														<option value="${policyGroup.groupId}" <c:if test="${_cfg.dnsStrategyId==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
 							              			</c:forEach>
 								                </select>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index 7fba8bea3..a45b99a94 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -296,7 +296,7 @@
 									<th exportColumn="whether_area_block"><spring:message code="whether_area_block"/></th>
 									</c:if>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipmulitiplex'}">
-									<th exportColumn="group_name"><spring:message code="group_name"/></th>
+									<th exportColumn="group_name"><spring:message code="group"/></th>
 									<th exportColumn="ir_type"><spring:message code="ir_type"/></th>
 									</c:if>
 									<c:if test="${specialFunctionId ne null and specialFunctionId eq 'ipratelimit'}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index e8270c021..2677f016c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -90,7 +90,7 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
                                         		<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option>
-												<form:option value="groupName"><spring:message code="group_name"></spring:message></form:option>
+												<form:option value="groupName"><spring:message code="group"></spring:message></form:option>
 											</form:select>
 									
                                          </div>
@@ -262,7 +262,7 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="group_name"/></th>
+									<th><spring:message code="group"/></th>
 									<th><spring:message code="ip"/></th>
 									<th><spring:message code="port"/></th>
 									<%-- <th><spring:message code="protocol"/></th>
diff --git a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
index 9616e115d..a75faf449 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictForm.jsp
@@ -41,7 +41,6 @@
 			
 				},
 				submitHandler: function(form){
-					
 					if(!validateItem()) {
 						return false;
 					}