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 e45d0055b..85d816c50 100644
--- a/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ComplexStringCfgController.java
@@ -44,7 +44,7 @@ public class ComplexStringCfgController extends BaseController{
 					if(!StringUtils.isBlank(tableName)){
 						logger.info("table name is "+tableName);
 						cfg.setTableName(tableName);
-						Page<ComplexkeywordCfg> page = complexStringCfgService.findPage(new Page<ComplexkeywordCfg>(request, response), cfg);
+						Page<ComplexkeywordCfg> page = complexStringCfgService.findPage(new Page<ComplexkeywordCfg>(request, response,"r"), cfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", cfg.getAction());
 						model.addAttribute("tableName", tableName);
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 226263b6c..5aa2a68fb 100644
--- a/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/NumCfgController.java
@@ -5,7 +5,6 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -13,10 +12,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.nis.domain.Page;
 import com.nis.domain.ServiceConfigInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.NumBoundaryCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 
@@ -40,17 +39,11 @@ public class NumCfgController extends BaseController{
 				model.addAttribute("serviceId", serviceId);
 				ServiceConfigInfo serviceConfigInfo=serviceConfigInfoService.findSysServiceConfigInfo(serviceId);
 				if(serviceConfigInfo!=null){
-						Page<NumBoundaryCfg> searchPage=new Page<NumBoundaryCfg>(request, response, 1);
-						if(pageNo!=null) searchPage.setPageNo(pageNo);
-						if(pageSize!=null) searchPage.setPageSize(pageSize);
-						if(cfg.getPage()!=null){
-							if(!StringUtils.isBlank(cfg.getPage().getOrderBy()));
-							searchPage.setOrderBy(cfg.getPage().getOrderBy());
-						}
+						Page<NumBoundaryCfg> searchPage=new Page<NumBoundaryCfg>(request, response, "r");
 						Page<NumBoundaryCfg> page = numCfgService.findPage(searchPage, cfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", cfg.getAction());
-						List<RequestInfo> requestInfos=requestInfoService.getValidRequestInfo();
+						List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 						model.addAttribute("requestInfos", requestInfos);
 						List<ServiceDictInfo> fls=serviceDictInfoService.findAllFlDict();
 						model.addAttribute("fls", fls);
diff --git a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
index f086ae03c..7267ef454 100644
--- a/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ComplexStringCfgDao.xml
@@ -39,12 +39,30 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
   </sql>
-  <sql id="ComplexkeywordCfg_Column_List_with_id_alias" >
+  <!-- <sql id="ComplexkeywordCfg_Column_List_with_id_alias" >
     r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.DISTRICT as district, r.KEYWORDS as keywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
     r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
     r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
     r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
     r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  </sql> -->
+  <sql id="ComplexkeywordCfg_Column_List_with_id_alias" >
+  	<choose>
+  		<when test="page !=null and page.alias != null and page.alias != ''">
+  		${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc,${page.alias}.DISTRICT as district, ${page.alias}.KEYWORDS as keywords, ${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
+	    ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
+	    ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
+	    ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin,
+	    ${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  		</when>
+  		<otherwise>
+  		r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.DISTRICT as district, r.KEYWORDS as keywords, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
+	    r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
+	    r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
+	    r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
+	    r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  		</otherwise>
+  	</choose>
   </sql>
   <sql id="ComplexkeywordCfg_Column_List" >
     CFG_DESC,DISTRICT,KEYWORDS, ACTION,IS_VALID,IS_AUDIT,
@@ -149,14 +167,7 @@
   </select>
   <select id="findList" resultMap="ComplexStringMapWithUser">
 		select 
-		<!--<choose>
-			 <when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when> 
-			<otherwise>-->
-				<include refid="ComplexkeywordCfg_Column_List_with_id_alias"/>	
-			<!-- </otherwise>
-		</choose> -->
+		<include refid="ComplexkeywordCfg_Column_List_with_id_alias"/>	
 		<trim prefix="," prefixOverrides=",">
 			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
 			,ri.request_title as requestName
@@ -167,88 +178,168 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
 			</if>
-			<if test="cfgId != null">
-    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-	    	<if test="cfgDesc != null">
-	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
-	    	</if>
-	    	<if test="district != null">
-    			AND r.DISTRICT like concat(concat('%',#{district,jdbcType=VARCHAR}),'%')
-    		</if>
-	    	<if test="keywords != null">
-    			AND r.KEYWORDS like concat(concat('%',#{keywords,jdbcType=VARCHAR}),'%')
-    		</if>
-	    	<if test="action != null">
-	    		AND r.ACTION=#{action,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="creatorName != null">
-	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="createTime != null">
-	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="editorName != null">
-	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="editTime != null">
-	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="auditorName != null">
-	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="auditTime != null">
-	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="serviceId != null">
-	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="requestId != null">
-	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="compileId != null">
-	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isAreaEffective != null">
-	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="classify != null">
-	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="attribute != null">
-	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="lable != null">
-	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="exprType != null">
-    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="matchMethod != null">
-	    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isHexbin != null">
-	    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="areaEffectiveIds != null">
-	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
-	    	</if>
+			<choose>
+		  		<when test="page !=null and page.alias != null and page.alias != ''">
+		  			<if test="cfgId != null">
+		    			AND ${page.alias}.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
+			    		AND ${page.alias}.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+			    	</if>
+			    	<if test="district != null and district != ''">
+		    			AND ${page.alias}.DISTRICT like concat(concat('%',#{district,jdbcType=VARCHAR}),'%')
+		    		</if>
+			    	<if test="keywords != null and keywords != ''">
+		    			AND ${page.alias}.KEYWORDS like concat(concat('%',#{keywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+			    	<if test="action != null">
+			    		AND ${page.alias}.ACTION=#{action,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid != null">
+			    		AND ${page.alias}.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND ${page.alias}.IS_VALID != -1
+			    	</if>
+			    	<if test="isAudit != null">
+			    		AND ${page.alias}.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="creatorName != null and creatorName != ''">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="createTime != null and createTime != ''">
+			    		AND ${page.alias}.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="editorName != null and editorName != ''">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="editTime != null and editTime != ''">
+			    		AND ${page.alias}.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="auditorName != null and auditorName != ''">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
+			    		AND ${page.alias}.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="serviceId != null">
+			    		AND ${page.alias}.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="requestId != null">
+			    		AND ${page.alias}.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="compileId != null">
+			    		AND ${page.alias}.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isAreaEffective != null">
+			    		AND ${page.alias}.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="classify != null and classify != ''">
+			    		AND ${page.alias}.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="attribute != null and attribute != ''">
+			    		AND ${page.alias}.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="lable != null and lable != ''">
+			    		AND ${page.alias}.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="exprType != null">
+		    			AND ${page.alias}.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="matchMethod != null">
+			    		AND ${page.alias}.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isHexbin != null">
+			    		AND ${page.alias}.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND ${page.alias}.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</when>
+		  		<otherwise>
+		  			<if test="cfgId != null">
+		    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
+			    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+			    	</if>
+			    	<if test="district != null and district != ''">
+		    			AND r.DISTRICT like concat(concat('%',#{district,jdbcType=VARCHAR}),'%')
+		    		</if>
+			    	<if test="keywords != null and keywords != ''">
+		    			AND r.KEYWORDS like concat(concat('%',#{keywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+			    	<if test="action != null">
+			    		AND r.ACTION=#{action,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid != null">
+			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND r.IS_VALID != -1
+			    	</if>
+			    	<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="creatorName != null and creatorName != ''">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="createTime != null and createTime != ''">
+			    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="editorName != null and editorName != ''">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="editTime != null and editTime != ''">
+			    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="auditorName != null and auditorName != ''">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
+			    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="serviceId != null">
+			    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="requestId != null">
+			    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="compileId != null">
+			    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isAreaEffective != null">
+			    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="classify != null and classify != ''">
+			    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="attribute != null and attribute != ''">
+			    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="lable != null and lable != ''">
+			    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="exprType != null">
+		    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="matchMethod != null">
+			    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isHexbin != null">
+			    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</otherwise>
+		  	</choose>
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -298,13 +389,13 @@
     update ${tableName}
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null" >
+      <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
       </if>
-      <if test="district != null">
+      <if test="district != null and district != ''">
     	district = #{district,jdbcType=VARCHAR},
       </if>
-      <if test="keywords != null">
+      <if test="keywords != null and keywords != ''">
     	keywords = #{keywords,jdbcType=VARCHAR},
       </if>
       <if test="action != null" >
@@ -319,19 +410,19 @@
       <if test="creatorId != null" >
         creator_id = #{creatorId,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null and createTime != ''" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="editorId != null" >
         editor_id = #{editorId,jdbcType=INTEGER},
       </if>
-      <if test="editTime != null" >
+      <if test="editTime != null and editTime != ''" >
         edit_time = #{editTime,jdbcType=TIMESTAMP},
       </if>
       <if test="auditorId != null" >
         auditor_id = #{auditorId,jdbcType=INTEGER},
       </if>
-      <if test="auditTime != null" >
+      <if test="auditTime != null and auditTime != ''" >
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
       <if test="serviceId != null" >
@@ -346,13 +437,13 @@
       <if test="isAreaEffective != null" >
         is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
       </if>
-      <if test="classify != null" >
+      <if test="classify != null and classify != ''" >
         classify = #{classify,jdbcType=VARCHAR},
       </if>
-      <if test="attribute != null" >
+      <if test="attribute != null and attribute != ''" >
         attribute = #{attribute,jdbcType=VARCHAR},
       </if>
-      <if test="lable != null" >
+      <if test="lable != null and lable != ''" >
         lable = #{lable,jdbcType=VARCHAR},
       </if>
       <if test="exprType != null">
@@ -364,7 +455,7 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
-      <if test="areaEffectiveIds != null" >
+      <if test="areaEffectiveIds != null and areaEffectiveIds != ''" >
         area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
       </if>
       </trim>
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 7a310ebbb..145cdf383 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -273,8 +273,8 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
diff --git a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
index 4a548e9c8..f32932669 100644
--- a/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/NumCfgDao.xml
@@ -39,12 +39,30 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
   </sql>
-  <sql id="NumCfg_Column_List_with_id_alias" >
+  <!-- <sql id="NumCfg_Column_List_with_id_alias" >
     r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.LOW_BOUNADRY as lowBounadry,r.UP_BOUNADRY as upBounadry, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
     r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
     r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
     r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
     r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  </sql> -->
+  <sql id="NumCfg_Column_List_with_id_alias" >
+	  <choose>
+	  		<when test="page !=null and page.alias != null and page.alias != ''">
+	  		${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc, ${page.alias}.LOW_BOUNADRY as lowBounadry,${page.alias}.UP_BOUNADRY as upBounadry, ${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
+		    ${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
+		    ${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
+		    ${page.alias}.ATTRIBUTE AS attribute,${page.alias}.LABLE AS lable,${page.alias}.EXPR_TYPE as exprType,${page.alias}.MATCH_METHOD as matchMethod,${page.alias}.IS_HEXBIN as isHexbin,
+		    ${page.alias}.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+	  		</when>
+	  		<otherwise>
+	  		r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.LOW_BOUNADRY as lowBounadry,r.UP_BOUNADRY as upBounadry, r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
+		    r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
+		    r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
+		    r.ATTRIBUTE AS attribute,r.LABLE AS lable,r.EXPR_TYPE as exprType,r.MATCH_METHOD as matchMethod,r.IS_HEXBIN as isHexbin,
+		    r.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+	  		</otherwise>
+	  </choose>
   </sql>
   <sql id="NumCfg_Column_List" >
     CFG_DESC, LOW_BOUNADRY,UP_BOUNADRY, ACTION,IS_VALID,IS_AUDIT,
@@ -170,88 +188,169 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
 			</if>
-			<if test="cfgId != null">
-    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-	    	<if test="cfgDesc != null">
-	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
-	    	</if>
-	    	<if test="lowBounadry != null">
-    			AND r.LOW_BOUNADRY=#{lowBounadry,jdbcType=BIGINT}
-    		</if>
-	    	<if test="upBounadry != null">
-    			AND r.UP_BOUNADRY=#{upBounadry,jdbcType=BIGINT}
-    		</if>
-	    	<if test="action != null">
-	    		AND r.ACTION=#{action,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="creatorName != null">
-	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="createTime != null">
-	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="editorName != null">
-	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="editTime != null">
-	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="auditorName != null">
-	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="auditTime != null">
-	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="serviceId != null">
-	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="requestId != null">
-	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="compileId != null">
-	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isAreaEffective != null">
-	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="classify != null">
-	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="attribute != null">
-	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="lable != null">
-	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="exprType != null">
-    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="matchMethod != null">
-	    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isHexbin != null">
-	    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="areaEffectiveIds != null">
-	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
-	    	</if>
+			<choose>
+		  		<when test="page !=null and page.alias != null and page.alias != ''">
+		  			<if test="cfgId != null">
+		    			AND ${page.alias}.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
+			    		AND ${page.alias}.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+			    	</if>
+			    	<if test="lowBounadry != null">
+		    			AND ${page.alias}.LOW_BOUNADRY=#{lowBounadry,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="upBounadry != null">
+		    			AND ${page.alias}.UP_BOUNADRY=#{upBounadry,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="action != null">
+			    		AND ${page.alias}.ACTION=#{action,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid != null">
+			    		AND ${page.alias}.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND ${page.alias}.IS_VALID != -1
+			    	</if>
+			    	<if test="isAudit != null">
+			    		AND ${page.alias}.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="creatorName != null">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="createTime != null and createTime != ''">
+			    		AND ${page.alias}.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="editorName != null and editorName != ''">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="editTime != null and editTime != ''">
+			    		AND ${page.alias}.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="auditorName != null and editTime != ''">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
+			    		AND ${page.alias}.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="serviceId != null">
+			    		AND ${page.alias}.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="requestId != null">
+			    		AND ${page.alias}.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="compileId != null">
+			    		AND ${page.alias}.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isAreaEffective != null">
+			    		AND ${page.alias}.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="classify != null and classify != ''">
+			    		AND ${page.alias}.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="attribute != null and attribute != ''">
+			    		AND ${page.alias}.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="lable != null and lable != ''">
+			    		AND ${page.alias}.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="exprType != null">
+		    			AND ${page.alias}.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="matchMethod != null">
+			    		AND ${page.alias}.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isHexbin != null">
+			    		AND ${page.alias}.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND ${page.alias}.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</when>
+		  		<otherwise>
+		  			<if test="cfgId != null">
+		    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="cfgDesc != null and cfgDesc != ''">
+			    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+			    	</if>
+			    	<if test="lowBounadry != null">
+		    			AND r.LOW_BOUNADRY=#{lowBounadry,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="upBounadry != null">
+		    			AND r.UP_BOUNADRY=#{upBounadry,jdbcType=BIGINT}
+		    		</if>
+			    	<if test="action != null">
+			    		AND r.ACTION=#{action,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid != null">
+			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND r.IS_VALID != -1
+			    	</if>
+			    	<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="creatorName != null">
+			    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="createTime != null and createTime != ''">
+			    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="editorName != null and editorName != ''">
+			    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="editTime != null and editTime != ''">
+			    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="auditorName != null and editTime != ''">
+			    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="auditTime != null and auditTime != ''">
+			    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
+			    	</if>
+			    	<if test="serviceId != null">
+			    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="requestId != null">
+			    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="compileId != null">
+			    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isAreaEffective != null">
+			    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="classify != null and classify != ''">
+			    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="attribute != null and attribute != ''">
+			    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="lable != null and lable != ''">
+			    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+			    	</if>
+			    	<if test="exprType != null">
+		    			AND r.EXPR_TYPE=#{exprType,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="matchMethod != null">
+			    		AND r.MATCH_METHOD=#{matchMethod,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isHexbin != null">
+			    		AND r.IS_HEXBIN=#{isHexbin,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+			    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+			    	</if>
+		  		</otherwise>
+		  	</choose>
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -301,7 +400,7 @@
     update num_boundary_cfg
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null" >
+      <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
       </if>
       <if test="lowBounadry != null">
@@ -322,19 +421,19 @@
       <if test="creatorId != null" >
         creator_id = #{creatorId,jdbcType=INTEGER},
       </if>
-      <if test="createTime != null" >
+      <if test="createTime != null and createTime != ''" >
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="editorId != null" >
         editor_id = #{editorId,jdbcType=INTEGER},
       </if>
-      <if test="editTime != null" >
+      <if test="editTime != null and editTime != ''" >
         edit_time = #{editTime,jdbcType=TIMESTAMP},
       </if>
       <if test="auditorId != null" >
         auditor_id = #{auditorId,jdbcType=INTEGER},
       </if>
-      <if test="auditTime != null" >
+      <if test="auditTime != null and auditTime != ''" >
         audit_time = #{auditTime,jdbcType=TIMESTAMP},
       </if>
       <if test="serviceId != null" >
@@ -349,13 +448,13 @@
       <if test="isAreaEffective != null" >
         is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
       </if>
-      <if test="classify != null" >
+      <if test="classify != null and classify != ''" >
         classify = #{classify,jdbcType=VARCHAR},
       </if>
-      <if test="attribute != null" >
+      <if test="attribute != null and classify != ''" >
         attribute = #{attribute,jdbcType=VARCHAR},
       </if>
-      <if test="lable != null" >
+      <if test="lable != null and lable != ''" >
         lable = #{lable,jdbcType=VARCHAR},
       </if>
       <if test="exprType != null">
@@ -367,7 +466,7 @@
       <if test="isHexbin != null">
     	is_hexbin=#{isHexbin,jdbcType=INTEGER},
       </if>
-      <if test="areaEffectiveIds != null" >
+      <if test="areaEffectiveIds != null and areaEffectiveIds != ''" >
         area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
       </if>
       </trim>
diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
index acd47fec2..f9fc17fe4 100644
--- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
@@ -197,8 +197,8 @@
 		left join sys_user u on r.auditor_id=u.id
 		left join request_info ri on r.request_id=ri.id
 		left join service_dict_info sdic on r.classify=sdic.item_code and sdic.item_type=1 and sdic.is_leaf=0
-		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=1 and sdia.is_leaf=0
-		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=1 and sdil.is_leaf=0
+		left join service_dict_info sdia on r.attribute=sdia.item_code and sdia.item_type=2 and sdia.is_leaf=0
+		left join service_dict_info sdil on r.lable=sdil.item_code and sdil.item_type=3 and sdil.is_leaf=0
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
index 2018aa0af..77aa62e17 100644
--- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp
@@ -5,7 +5,7 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                 <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
             </div>
         </div>
@@ -14,7 +14,7 @@
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><spring:message code="match_area"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <input class="form-control" type="text" name="district" value="${_cfg.district}">
             </div>
         </div>
@@ -24,7 +24,7 @@
 	<div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><spring:message code="key_word"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	 <input class="form-control" type="text" name="keywords" value="${_cfg.keywords}">
             </div>
         </div>
@@ -33,7 +33,7 @@
 	<%-- <div class="col-md-6">
 	    <div class="form-group ">
 	            <label class="control-label col-md-3">管控类型</label>
-	            <div class="col-md-8">
+	            <div class="col-md-6">
             	 <select name="action" class="selectpicker select2 form-control" readonly="readonly">
             	 	<option value="1" <c:if test="${_cfg.action==1}">selected</c:if><c:if test="${_cfg.action!=1}">disabled="disabled"</c:if> >阻断</option>
             	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> >监测</option>
@@ -49,7 +49,7 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3"><spring:message code="whether_area_block"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="isAreaEffective" value="1"
             			<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
@@ -69,7 +69,7 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3"><spring:message code="expression_type"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<label class="radio-inline">
             		<input type="radio" name="exprType" value="1"
             			<c:if test="${_cfg.exprType==1}">checked</c:if>
@@ -86,7 +86,7 @@
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><spring:message code="match_method"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="matchMethod" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
 					<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
 					<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
@@ -101,7 +101,7 @@
     <div class="col-md-6">
         <div class="form-group">
             <label class="control-label col-md-3"><spring:message code="whether_hexbinary"/></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
             	<select name="isHexbin" class="selectpicker select2 form-control" title=<spring:message code="select"/> >
 					<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
 					<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
@@ -113,7 +113,7 @@
     <div class="col-md-6">
         <div class="form-group ">
             <label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
-            <div class="col-md-8">
+            <div class="col-md-6">
                  <input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
             </div>
         </div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 5cd144e66..8cefa23f6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -21,8 +21,22 @@
 </c:choose>
 <script>
  	$(document).ready(function() {
-		
-		
+ 		//筛选功能初始化
+		filterActionInit();
+		$("#isAudit").change(function(){
+			page();
+		});
+		//reset
+		$("#resetBtn").on("click",function(){
+			$("select.selectpicker").each(function(){
+				$(this).selectpicker('val',$(this).find('option:first').val());
+				$(this).find("option").attr("selected",false);
+				$(this).find("option:first").attr("selected",true);
+			});
+			$(".Wdate").attr("value",'');
+			$("#keywords").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
  	});
 	//查询
  	function page(n,s){
@@ -37,7 +51,7 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
+		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
 		<c:if test="${audit==0}">
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/cfg/complex/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
@@ -46,59 +60,165 @@
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
+		<small><spring:message code="date_list"/></small>
 	</h3>
-
+	<h5 class="page-header"></h5>
 	<div class="row">
 		<div class="col-md-12">
-			<div class="portlet box blue">
-				<div class="portlet-title">
-					<div class="caption">
-						<i class="fa fa-cogs"></i><spring:message code="date_list"></spring:message>
-					</div>
-					<div class="tools">
-						<!-- <a href="javascript:;" class="collapse" data-original-title=""
-							title=""> </a> <a href="#portlet-config" data-toggle="modal"
-							class="config" data-original-title="" title=""> </a> <a
-							href="javascript:;" class="reload" data-original-title=""
-							title=""> </a> <a href="javascript:;" class="remove"
-							data-original-title="" title=""> </a> -->
-					</div>
-				</div>
+			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/complex/list" method="post" class="form-search">
+							<input id="cfgName" name="cfgName" type="hidden" value="${cfgName}"/>
+							<input id="action" name="action" type="hidden" value="${action}"/>
+							<input id="serviceId" name="serviceId" type="hidden" value="${serviceId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<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="${cfg.isFilterAction }"/>
+							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
-								<spring:message code="state"/> : <form:select path="isAudit" class="selectpicker select2">
-									<form:option value=""><spring:message code="select"/></form:option>
-									<form:option value="0"><spring:message code="created"></spring:message></form:option>
-									<form:option value="1"><spring:message code="approved"></spring:message></form:option>
-									<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-									<form:option value="3"><spring:message code="cancel"></spring:message></form:option>
-								</form:select>
-								<spring:message code="request_number"/> :
-								<form:select path="requestId" class="selectpicker select2" data-live-search="true" data-live-search-placeholder="search">
-									<form:option value=""><spring:message code="select"/></form:option>
-									<c:forEach items="${requestInfos}" var="requestInfo" >
-										<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
-									</c:forEach>
-								</form:select>
-								<button type="button" class="btn btn-default btn-sm" onclick="return page()">
+								<div class="pull-left">
+									<c:set var="state"><spring:message code='state'/></c:set>
+									<form:select path="isAudit" class="selectpicker select2 input-small" title="${state}">
+										<%-- <form:option value=""><spring:message code="state"/></form:option> --%>
+										<form:option value="0"><spring:message code="created"></spring:message></form:option>
+										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
+										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
+										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="request_number"><spring:message code='request_number'/></c:set>
+									<form:select path="requestId" class="selectpicker select2 input-small" title="${request_number}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${requestInfos}" var="requestInfo" >
+											<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="flI18n"><spring:message code='type'/></c:set>
+									<form:select path="classify" class="selectpicker select2 input-small" title="${flI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${fls}" var="fl" >
+											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="attributeI18n"><spring:message code='attribute'/></c:set>
+									<form:select path="attribute" class="selectpicker select2 input-small" title="${attributeI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${xzs}" var="xz" >
+											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<div class="pull-left">
+									<c:set var="labelI18n"><spring:message code='label'/></c:set>
+									<form:select path="lable" class="selectpicker select2 input-small" title="${labelI18n}" data-live-search="true" data-live-search-placeholder="search">
+										<c:forEach items="${lables}" var="lable" >
+											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+										</c:forEach>
+									</form:select>
+								</div>
+								<%-- <button type="button" class="btn btn-default btn-sm" onclick="return page()">
 								<i class="fa fa-edit"></i><spring:message code="search"></spring:message>
-								</button>
-								<spring:message code="sort"/> : 
-								<select name="orderBy" class="selectpicker select2">
-									<option value=""><spring:message code="select"/></option>
-									<option value="createTime asc" <c:if test="${page.orderBy eq 'createTime asc' }">selected</c:if> ><spring:message code="createTime_asc"/></option>
-									<option value="createTime desc" <c:if test="${page.orderBy eq 'createTime desc' }">selected</c:if> ><spring:message code="createTime_desc"/></option>
-									<option value="editTime asc" <c:if test="${page.orderBy eq 'editTime asc' }">selected</c:if> ><spring:message code="editTime_asc"/></option>
-									<option value="editTime desc" <c:if test="${page.orderBy eq 'editTime desc' }">selected</c:if> ><spring:message code="editTime_desc"/></option>
-									<option value="auditTime asc" <c:if test="${page.orderBy eq 'auditTime asc' }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
-									<option value="auditTime desc" <c:if test="${page.orderBy eq 'auditTime desc' }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
-								</select>
+								</button> --%>
+								<div class="pull-left">
+								<c:set var="sortI18n"><spring:message code="sort"/></c:set>
+									<select name="orderBy" class="selectpicker select2 input-small" title="${sortI18n}">
+										<option value="${page.alias}.create_time asc" <c:if test="${fn:contains(page.orderBy,'create_time asc') }">selected</c:if> ><spring:message code="createTime_asc"/></option>
+										<option value="${page.alias}.create_time desc" <c:if test="${fn:contains(page.orderBy , 'create_time desc') }">selected</c:if> ><spring:message code="createTime_desc"/></option>
+										<option value="${page.alias}.edit_time asc" <c:if test="${fn:contains(page.orderBy , 'edit_time asc') }">selected</c:if> ><spring:message code="editTime_asc"/></option>
+										<option value="${page.alias}.edit_time desc" <c:if test="${fn:contains(page.orderBy , 'edit_time desc') }">selected</c:if> ><spring:message code="editTime_desc"/></option>
+										<option value="${page.alias}.audit_time asc" <c:if test="${fn:contains(page.orderBy , 'audit_time asc') }">selected</c:if> ><spring:message code="auditTime_asc"/></option>
+										<option value="${page.alias}.audit_time desc" <c:if test="${fn:contains(page.orderBy , 'audit_time desc') }">selected</c:if> ><spring:message code="auditTime_desc"/></option>
+									</select>
+								</div>
+								<div class="pull-left">
+	                                     <button type="button" class="btn btn-default" id="filter-btn"> 筛选  <i class="fa fa-angle-double-down"></i></button>
+								</div>
+								 <div class="pull-right">
+                                    <button class="btn btn-default btn-search" type="button" onclick="return page()"><i class="fa fa-search"></i></button>
+                                 </div>
 							</div>
+							<!-- 搜索内容与操作按钮栏 -->
+							
+							<!-- 筛选搜索内容栏默认隐藏-->
+							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+									<div class="col-md-6">
+											<div class="pull-left col-md-2">
+												<label><spring:message code="config_time"/>：</label>
+											</div>
+											<div class="pull-left">
+												<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											<div class="pull-left">
+												<label>到</label>
+											</div>
+											<div class="pull-left">
+												<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+												value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											</div>
+											
+									</div>
+							
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="edit_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="audit_time"/>：</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+										<div class="pull-left">
+											<label>到</label>
+										</div>
+										<div class="pull-left">
+											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
+											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+										</div>
+									</div>
+									<div class="col-md-6">
+										<div class="pull-left col-md-2">
+											<label><spring:message code="key_word"/>：</label>
+										</div>
+										<div class="pull-left">
+											<form:input path="keywords" class="form-control input-small"/>
+										</div>
+									</div>
+								</div>
+								<h5 class="page-header"></h5>
+								<div class="row">
+									
+									<div class="pull-left">
+										<button type="button" class="btn blue" onclick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
+										<button type="button" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+									</div>
+							
+								</div>
+							</div>
+							
+							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
 					<div class="table-responsive">
@@ -130,9 +250,9 @@
 								</tr>
 							</thead>
 							<tbody>
-								<c:forEach items="${page.list }" var="cfg">
+								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
-									<td>${cfg.cfgId }</td>
+									<td>${status.index+1 }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>${cfg.district }</td>
 									<td>${cfg.keywords }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 370c63578..fff8f1377 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -33,6 +33,7 @@
 				$(this).find("option").attr("selected",false);
 				$(this).find("option:first").attr("selected",true);
 			});
+			$(".Wdate").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index a45e2a6a8..287103211 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -34,6 +34,7 @@
 				$(this).find("option:first").attr("selected",true);
 			});
 			$("#cfgKeywords").attr("value",'');
+			$(".Wdate").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
  	});