From 124c968c4ac7442fa877f5e0cee572d56cd74b6e Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 22 Mar 2018 15:10:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E6=AC=A1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=9A=84=E9=97=AE=E9=A2=98(=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E4=B8=8D=E4=B8=8B=E5=8E=BB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/configuration/DnsIpCfg.java |  8 ++++++++
 .../configuration/DnsIpCfgController.java      | 18 +++++++++++++-----
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp  |  9 +++++++--
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java
index 1bce2316c..7ecb69b8c 100644
--- a/src/main/java/com/nis/domain/configuration/DnsIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/DnsIpCfg.java
@@ -127,6 +127,14 @@ public class DnsIpCfg extends BaseEntity<DnsIpCfg> {
 	 */
 	private String lable;
 	
+	private String cfgIds;
+	
+	public String getCfgIds() {
+		return cfgIds;
+	}
+	public void setCfgIds(String cfgIds) {
+		this.cfgIds = cfgIds;
+	}
 	public Long getCfgId() {
 		return cfgId;
 	}
diff --git a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java
index 0550f0467..787806a96 100644
--- a/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/DnsIpCfgController.java
@@ -58,6 +58,7 @@ public class DnsIpCfgController extends BaseController {
 			dnsIpCfg.setIsValid(1);
 			dnsIpCfg.setCreateTime(now);
 			dnsIpCfg.setCreator(UserUtils.getUser());
+			dnsIpCfg.setIsAudit(1);
 		} else {//修改
 			dnsIpCfg.setEditor(UserUtils.getUser());
 			dnsIpCfg.setEditTime(now);
@@ -70,19 +71,26 @@ public class DnsIpCfgController extends BaseController {
 	}
 	
 	@RequestMapping("delete")
-	public String delete(Model model, String cfgIds, RedirectAttributes redirectAttributes) {
+	public String delete(Model model, HttpServletRequest request, 
+			HttpServletResponse response, DnsIpCfg dnsIpCfg) {
+		String cfgIds = dnsIpCfg.getCfgIds();
 		if (!StringUtils.isEmpty(cfgIds)) {
 			try {
 				dnsIpCfgService.delete(cfgIds);
-				addMessage(redirectAttributes, "删除成功");
+				addMessage(model, "删除成功");
 			} catch (Exception e) {
 				e.printStackTrace();
-				addMessage(redirectAttributes, "删除失败");
+				addMessage(model, "删除失败");
 			}
 		} else {
-			addMessage(redirectAttributes, "删除失败");
+			addMessage(model, "删除失败");
 		}
-		return "redirect:" + adminPath + "/cfg/dnsIp/list";
+		
+		Page<DnsIpCfg> page = dnsIpCfgService.findPage(new Page<DnsIpCfg>(request, response, 30), dnsIpCfg);
+		model.addAttribute("page", page);
+		
+		addRequestAndServiceDictToModel(model);
+		return "/cfg/dnsIpCfgList";
 	}
 	
 	private void addRequestAndServiceDictToModel(Model model) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index f465344f7..6494a753c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -65,11 +65,15 @@
 		if (checkboxes.length == 0) {
 			alertx("请选择一条配置");
 		} else {
-			var ids;
+			var ids = "";
 			checkboxes.each(function(){
 				ids = ids + $(this).attr("id") + ",";
 			});
-			confirmx("<spring:message code='confirm_message'/>", "${ctx}/cfg/dnsIp/delete?cfgIds=" + ids);
+			if (confirm("<spring:message code='confirm_message'/>")) {
+				$("#cfgIds").val(ids);
+				$("#searchForm").attr("action","${ctx}/cfg/dnsIp/delete");
+				$("#searchForm").submit();
+			}
 		}
 	}
 </script>
@@ -99,6 +103,7 @@
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${dnsIpCfg.isFilterAction }"/>
+							<input id="cfgIds" name="cfgIds" type="hidden"/>
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">