diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java
index 1ebdd3b7b..d9e85751c 100644
--- a/src/main/java/com/nis/util/Constants.java
+++ b/src/main/java/com/nis/util/Constants.java
@@ -6,6 +6,8 @@ import com.google.gson.GsonBuilder;
 
 public final class Constants {
 	
+	public static final int CFG_PAGE = 0;
+	public static final int AUDIT_PAGE = 1;
 	public static final String DEFAULT_CAPTCHA_PARAM = "captcha";
 	public static final String DEFAULT_MOBILE_PARAM = "mobileLogin";
 	public static final String DEFAULT_MESSAGE_PARAM = "message";
diff --git a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
index e5f70d325..9e6164709 100644
--- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
@@ -30,8 +30,9 @@ import com.nis.web.controller.BaseController;
 public class ComplexStringCfgController extends BaseController{
 	
 	@RequestMapping(value = {"list"})
-	public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+	public String cfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")ComplexkeywordCfg cfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(cfg!=null){
 			Integer serviceId=cfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -78,6 +79,7 @@ public class ComplexStringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("serviceId", serviceId);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -125,6 +127,7 @@ public class ComplexStringCfgController extends BaseController{
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
 		model.addAttribute("tableName", tableName);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			logger.info("table name is "+tableName);
 			ComplexkeywordCfg searchBean=new ComplexkeywordCfg();
@@ -132,7 +135,7 @@ public class ComplexStringCfgController extends BaseController{
 			searchBean.setTableName(tableName);
 			ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean);
 			model.addAttribute("_cfg", cfg);
-			List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+			List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 			model.addAttribute("requestInfos", requestInfos);
 			List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 			model.addAttribute("fls", fls);
@@ -151,7 +154,7 @@ public class ComplexStringCfgController extends BaseController{
 					searchBean.setTableName(tableName);
 					ComplexkeywordCfg cfg=complexStringCfgService.getStringCfgById(searchBean);
 					model.addAttribute("_cfg", cfg);
-					List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+					List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 					model.addAttribute("requestInfos", requestInfos);
 					List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 					model.addAttribute("fls", fls);
@@ -182,6 +185,7 @@ public class ComplexStringCfgController extends BaseController{
 	public String saveOrUpdateStringCfg(String cfgName,Model model, ComplexkeywordCfg cfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType","complex");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateStringCfg loaded");
 		if(cfg==null){
 			logger.error("无法保存空的配置！");
@@ -252,6 +256,7 @@ public class ComplexStringCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditStringCfg(String cfgName,ComplexkeywordCfg cfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(cfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(!StringUtils.isBlank(cfg.getTableName())){
@@ -296,7 +301,7 @@ public class ComplexStringCfgController extends BaseController{
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/complex/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/complex/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName;
 	}
 	/**
 	 * 
@@ -313,6 +318,7 @@ public class ComplexStringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("cfgType","complex");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			int audit=complexStringCfgService.getIsAudit(tableName,cfgId);
 			//未审核时可删除
diff --git a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
index 987907616..9f5e18b6b 100644
--- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
@@ -29,18 +29,23 @@ import com.nis.web.controller.BaseController;
 @Controller
 @RequestMapping("${adminPath}/cfg/ip")
 public class IpCfgController extends BaseController{
-	
-	@RequestMapping(value = {"ipWhiteList"})
-	public String ipWhiteList(Model model,BaseIpCfg baseIpCfg,HttpServletRequest request,HttpServletResponse response) {
-		return "/cfg/ipWhiteList";
-	}
-	
-
-	@RequestMapping(value = {"ipWhiteForm"})
-	public String ipWhiteForm() {
-		return "/cfg/ipWhiteForm";
-	}
-	
+	/**
+	 * 
+	 * ipCfgList(配置列表与审核列表，需要根据参数判断是哪个列表，以便显示隐藏对应的界面菜单，按钮)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param model
+	 * @param audit
+	 * @param pageNo
+	 * @param pageSize
+	 * @param cfgName
+	 * @param ipCfg
+	 * @param request
+	 * @param response
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
 	@RequestMapping(value = {"list"})
 	public String ipCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("ipCfg")BaseIpCfg ipCfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
@@ -85,12 +90,27 @@ public class IpCfgController extends BaseController{
 		return "/cfg/ipCfgList";
 	}
 	
-
+	/**
+	 * 
+	 * ipCfgForm(新增页面初始化，只会在配置界面使用)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param action
+	 * @param cfgName
+	 * @param serviceId
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
 	@RequestMapping(value = {"form"})
 	public String ipCfgForm(int action,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -133,12 +153,30 @@ public class IpCfgController extends BaseController{
 		
 		return "/cfg/ipCfgForm";
 	}
+	/**
+	 * 
+	 * updateIpCfgForm(更新配置页面初始化，只会在配置界面出现)
+	 * (这里描述这个方法适用条件 – 可选)
+	 * @param tableName
+	 * @param action
+	 * @param cfgId
+	 * @param cfgName
+	 * @param serviceId
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @return 
+	 *String
+	 * @exception 
+	 * @since  1.0.0
+	 */
 	@RequiresPermissions("sys:cfg:edit")
 	@RequestMapping(value = {"updateForm"})
 	public String updateIpCfgForm(String tableName,int action,long cfgId,String cfgName,Integer serviceId,Model model,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
+		model.addAttribute("audit",Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			logger.info("table name is "+tableName);
 			BaseIpCfg searchBean=new BaseIpCfg();
@@ -147,7 +185,7 @@ public class IpCfgController extends BaseController{
 			BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean);
 			model.addAttribute("_cfg", ipCfg);
 			model.addAttribute("tableName", tableName);
-			List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+			List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 			model.addAttribute("requestInfos", requestInfos);
 			List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 			model.addAttribute("fls", fls);
@@ -167,7 +205,7 @@ public class IpCfgController extends BaseController{
 					BaseIpCfg ipCfg=ipCfgService.getIpCfgById(searchBean);
 					model.addAttribute("_cfg", ipCfg);
 					model.addAttribute("tableName", tableName);
-					List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+					List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 					model.addAttribute("requestInfos", requestInfos);
 					List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 					model.addAttribute("fls", fls);
@@ -187,7 +225,7 @@ public class IpCfgController extends BaseController{
 	
 	/**
 	 * 
-	 * addIpCfg(新增IP配置)
+	 * addIpCfg(新增IP配置，后台保存方法)
 	 * (这里描述这个方法适用条件 – 可选)
 	 * @return 
 	 *String
@@ -198,6 +236,7 @@ public class IpCfgController extends BaseController{
 	public String saveOrUpdateIpCfg(String cfgName,Model model, BaseIpCfg ipCfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType", "ip");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateIpCfg loaded");
 		if(ipCfg==null){
 			logger.error("无法保存空的配置！");
@@ -258,7 +297,7 @@ public class IpCfgController extends BaseController{
 	/**
 	 * 
 	 * auditIpCfg(审核IP配置)
-	 * (这里描述这个方法适用条件 – 可选)
+	 * (审核流程只在审核页面)
 	 * @return 
 	 *String
 	 * @exception 
@@ -267,6 +306,7 @@ public class IpCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditIpCfg(String cfgName,BaseIpCfg ipCfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(ipCfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(!StringUtils.isBlank(ipCfg.getTableName())){
@@ -311,7 +351,7 @@ public class IpCfgController extends BaseController{
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/ip/list?serviceId="+ipCfg.getServiceId()+"&action="+ipCfg.getAction()+"&cfgName="+cfgName+"&audit=1";
 	}
 	/**
 	 * 
@@ -329,6 +369,7 @@ public class IpCfgController extends BaseController{
 			model.addAttribute("serviceId", serviceId);
 			model.addAttribute("action", action);
 			model.addAttribute("cfgType", "ip");
+			model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			int audit=ipCfgService.getIsAudit(tableName,cfgId);
 			//未审核时可删除
diff --git a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
index 86491356b..2ed73be13 100644
--- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
@@ -30,8 +30,9 @@ import com.nis.web.controller.BaseController;
 public class NumCfgController extends BaseController{
 	
 	@RequestMapping(value = {"list"})
-	public String cfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) {
+	public String cfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")NumBoundaryCfg cfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(cfg!=null){
 			Integer serviceId=cfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -72,6 +73,7 @@ public class NumCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("serviceId", serviceId);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -101,6 +103,7 @@ public class NumCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
 			if(serviceConfigInfo!=null){
@@ -108,7 +111,7 @@ public class NumCfgController extends BaseController{
 				searchBean.setCfgId(cfgId);
 				NumBoundaryCfg cfg=numCfgService.getNumCfgById(searchBean);
 				model.addAttribute("_cfg", cfg);
-				List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+				List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 				model.addAttribute("requestInfos", requestInfos);
 				List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 				model.addAttribute("fls", fls);
@@ -138,6 +141,7 @@ public class NumCfgController extends BaseController{
 	public String saveOrUpdateStringCfg(String cfgName,Model model, NumBoundaryCfg cfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType","num");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateStringCfg loaded");
 		if(cfg==null){
 			logger.error("无法保存空的配置！");
@@ -184,6 +188,7 @@ public class NumCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditStringCfg(String cfgName,NumBoundaryCfg cfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(cfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(cfg.getServiceId()!=null){
@@ -208,7 +213,7 @@ public class NumCfgController extends BaseController{
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/num/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/num/list?serviceId="+cfg.getServiceId()+"&action="+cfg.getAction()+"&cfgName="+cfgName;
 	}
 	/**
 	 * 
@@ -225,6 +230,7 @@ public class NumCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("cfgType","num");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
 			if(serviceConfigInfo!=null){
diff --git a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
index ac11ffc3f..3d966c272 100644
--- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
@@ -30,8 +30,9 @@ import com.nis.web.controller.BaseController;
 public class StringCfgController extends BaseController{
 	
 	@RequestMapping(value = {"list"})
-	public String stringCfgList(Model model,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) {
+	public String stringCfgList(Model model,Integer audit,Integer pageNo,Integer pageSize,String cfgName,@ModelAttribute("cfg")BaseStringCfg stringCfg,HttpServletRequest request,HttpServletResponse response) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", audit);
 		if(stringCfg!=null){
 			Integer serviceId=stringCfg.getServiceId();
 			logger.info("servcice id is "+serviceId);
@@ -78,6 +79,7 @@ public class StringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("serviceId", serviceId);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("sercice id is "+serviceId);
 		if(serviceId!=null){
 			ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
@@ -125,6 +127,7 @@ public class StringCfgController extends BaseController{
 		model.addAttribute("serviceId", serviceId);
 		model.addAttribute("action", action);
 		model.addAttribute("tableName", tableName);
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			logger.info("table name is "+tableName);
 			BaseStringCfg searchBean=new BaseStringCfg();
@@ -132,7 +135,7 @@ public class StringCfgController extends BaseController{
 			searchBean.setTableName(tableName);
 			BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean);
 			model.addAttribute("_cfg", stringCfg);
-			List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+			List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 			model.addAttribute("requestInfos", requestInfos);
 			List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 			model.addAttribute("fls", fls);
@@ -151,7 +154,7 @@ public class StringCfgController extends BaseController{
 					searchBean.setTableName(tableName);
 					BaseStringCfg stringCfg=stringCfgService.getStringCfgById(searchBean);
 					model.addAttribute("_cfg", stringCfg);
-					List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+					List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 					model.addAttribute("requestInfos", requestInfos);
 					List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 					model.addAttribute("fls", fls);
@@ -182,6 +185,7 @@ public class StringCfgController extends BaseController{
 	public String saveOrUpdateStringCfg(String cfgName,Model model, BaseStringCfg stringCfg) {
 		model.addAttribute("cfgName",cfgName);
 		model.addAttribute("cfgType","string");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		logger.info("saveOrUpdateStringCfg loaded");
 		if(stringCfg==null){
 			logger.error("无法保存空的配置！");
@@ -252,6 +256,7 @@ public class StringCfgController extends BaseController{
 	@RequestMapping(value = {"auditCfg"})
 	public String auditStringCfg(String cfgName,BaseStringCfg stringCfg,Model model) {
 		model.addAttribute("cfgName", cfgName);
+		model.addAttribute("audit", Constants.AUDIT_PAGE);
 		if(stringCfg==null){
 			logger.error("无法审核空的配置！");
 		}else if(!StringUtils.isBlank(stringCfg.getTableName())){
@@ -296,7 +301,7 @@ public class StringCfgController extends BaseController{
 		}else{
 			logger.error("无法确定IP配置的表名！");
 		}
-		return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName"+cfgName;
+		return "redirect:" + adminPath + "/cfg/string/list?serviceId="+stringCfg.getServiceId()+"&action="+stringCfg.getAction()+"&cfgName="+cfgName;
 	}
 	/**
 	 * 
@@ -313,6 +318,7 @@ public class StringCfgController extends BaseController{
 		model.addAttribute("cfgName", cfgName);
 		model.addAttribute("action", action);
 		model.addAttribute("cfgType","string");
+		model.addAttribute("audit", Constants.CFG_PAGE);
 		if(!StringUtils.isBlank(tableName)){
 			int audit=stringCfgService.getIsAudit(tableName,cfgId);
 			//未审核时可删除
diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
index f0cb73683..b6e514217 100644
--- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml
@@ -162,5 +162,9 @@
     </set>
     where id = #{id,jdbcType=BIGINT} and is_audit !=1
   </update>
-  
+  <select id="findAllList" resultMap="BaseResultMap">
+	select
+		<include refid="Base_Column_List" />
+	from request_info
+  </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index cfb68bf41..6e31519ff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -5,6 +5,17 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
+<c:choose>
+	<c:when test="${cookie.Language.value eq 'zh_CN'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'en'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-en_US.min.js"></script>
+	</c:when>
+	<c:when test="${cookie.Language.value eq 'ru_RU'}">
+		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-ru_RU.min.js"></script>
+	</c:when>
+</c:choose>
 <script>
  	$(document).ready(function() {
 		
@@ -213,26 +224,29 @@
 										<div class="btn-group btn-xs">
 									      <a class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" href="#"><spring:message code="operation"></spring:message><span class="caret"></span></a>
 									      <ul class="dropdown-menu btn-xs">
-								      <!-- 审核未通过可修改 -->
-								        	<c:choose>
+									      <c:if test="${audit==0}">
+									      	<c:choose>
+									      		<c:when test="${ipCfg.isAudit eq '2'}">
+									      			<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      		</c:when>
+									      		<c:when test="${ipCfg.isAudit eq '0'}">
+									      			<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
+									      			<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
+									      		</c:when>
+									      	</c:choose>
+									      </c:if>
+									      <c:if test="${audit==1}">
+									      	<c:choose>
 									        	<c:when test="${ipCfg.isAudit eq '1'}">
 											        <li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=3&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="cancel"></spring:message></a></li>
 									        	</c:when>
 									        	<c:when test="${ipCfg.isAudit eq '0'}">
-									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="unapproved"></spring:message></a></li>
+									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=2&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
 									        	</c:when>
-									        	<c:when test="${ipCfg.isAudit eq '2'}">
-									        		<li><a href="${ctx}/cfg/ip/updateForm?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="javascript:return confirm('sure？', this.href)"><spring:message code="edit"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-									        		<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:when>
-									        	<c:otherwise>
-											        <li><a href="${ctx}/cfg/ip/auditCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&isAudit=1&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="approved"></spring:message></a></li>
-								        			<li><a href="${ctx}/cfg/ip/deleteCfg?serviceId=${ipCfg.serviceId}&action=${ipCfg.action}&tableName=${ipCfg.tableName}&cfgId=${ipCfg.cfgId}&cfgName=${cfgName}" onclick="return confirm('sure？', this.href)"><spring:message code="delete"></spring:message></a></li>
-									        	</c:otherwise>
 								        	</c:choose>
+									      </c:if>
+								        	
 									      </ul>
 									    </div>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp b/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp
index 0c402cf91..e333e7de0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/resultPage.jsp
@@ -5,7 +5,7 @@
 <title>结果跳转页</title>
 <script type="text/javascript">
 $(document).ready(function() {
-	setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'",1000);
+	setTimeout("javascript:window.location.href='${ctx}/cfg/${cfgType}/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'",1000);
 });
 </script>
 </head>