From 17668bceb7a436c057e29708c3ea8c18b35a4bb5 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 12 Mar 2018 11:38:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?(1)=E4=BF=AE=E5=A4=8DIP=E7=B1=BBPZ=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=80=BC=E4=B8=BA0=E6=97=B6?=
 =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B2=A1=E6=9C=89=E4=BC=A0=E5=80=BC=E7=9A=84?=
 =?UTF-8?q?bug=20(2)=E8=B0=83=E6=95=B4=E8=B0=83=E6=95=B4PZ=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E5=88=86=E7=B1=BB=EF=BC=8C=E6=80=A7=E8=B4=A8?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=87=E7=AD=BE=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C?=
 =?UTF-8?q?=E7=94=B1ITEM=5FCODE=20=E6=94=B9=E4=B8=BA=20service=5Fdict=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/IpCfgController.java        |  6 +-
 .../nis/web/dao/configuration/IpCfgDao.xml    | 86 +++++++++----------
 .../webapp/WEB-INF/include/form/basicInfo.jsp | 22 ++---
 .../WEB-INF/views/cfg/complexCfgList.jsp      |  6 +-
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    | 35 ++++----
 .../WEB-INF/views/cfg/stringCfgList.jsp       |  6 +-
 6 files changed, 82 insertions(+), 79 deletions(-)

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 179088d42..4ff3d08be 100644
--- a/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/IpCfgController.java
@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 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.ServiceConfigInfo;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.util.Constants;
@@ -65,7 +65,7 @@ public class IpCfgController extends BaseController{
 						model.addAttribute("page", page);
 						model.addAttribute("action", ipCfg.getAction());
 						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);
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 c616369e8..7a310ebbb 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -276,19 +276,18 @@
 		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
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-			
 			<if test="page !=null and page.where != null and page.where != ''">
 			 AND ${page.where}
 			</if>
 			<choose>
 		  		<when test="page !=null and page.alias != null and page.alias != ''">
-		  			<if test="cfgId != null and cfgId != ''">
+		  			<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="ipType != null and ipType != ''">
+			    	<if test="ipType != null">
 			    		AND ${page.alias}.IP_TYPE=#{ipType,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcIp != null and srcIp != ''">
@@ -315,25 +314,25 @@
 			    	<if test="dstPortMask != null and dstPortMask !=''">
 			    		AND ${page.alias}.DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR}
 			    	</if> 
-			    	<if test="direction != null and direction!= ''">
+			    	<if test="direction != null">
 			    		AND ${page.alias}.DIRECTION=#{direction,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="protocol != null and protocol!=''">
+			    	<if test="protocol != null">
 			    		AND ${page.alias}.PROTOCOL=#{protocol,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="protocolId != null and protocolId !=''">
+			    	<if test="protocolId != null">
 			    		AND ${page.alias}.PROTOCOL_ID=#{protocolId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="action != null and action !=''">
+			    	<if test="action != null">
 			    		AND ${page.alias}.ACTION=#{action,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="isValid != null and isValid !=''">
+			    	<if test="isValid != null">
 			    		AND ${page.alias}.IS_VALID=#{isValid,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="isValid == null and isValid !=''">
+			    	<if test="isValid == null">
 			    		AND ${page.alias}.IS_VALID != -1
 			    	</if>
-			    	<if test="isAudit != null and isAudit !=''">
+			    	<if test="isAudit != null">
 			    		AND ${page.alias}.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="creatorName != null and creatorName !=''">
@@ -354,16 +353,16 @@
 			    	<if test="auditTime != null and auditTime !=''">
 			    		AND ${page.alias}.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
 			    	</if>
-			    	<if test="serviceId != null and serviceId !=''">
+			    	<if test="serviceId != null">
 			    		AND ${page.alias}.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="requestId != null and requestId !=''">
+			    	<if test="requestId != null">
 			    		AND ${page.alias}.REQUEST_ID=#{requestId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="compileId != null and compileId !=''">
+			    	<if test="compileId != null">
 			    		AND ${page.alias}.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="isAreaEffective != null and isAreaEffective !=''">
+			    	<if test="isAreaEffective != null">
 			    		AND ${page.alias}.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="classify != null and classify !=''">
@@ -380,13 +379,13 @@
 			    	</if>
 		  		</when>
 		  		<otherwise>
-		  		<if test="cfgId != null and cfgId != ''">
+		  		<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="ipType != null and ipType != ''">
+			    	<if test="ipType != null">
 			    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcIp != null and srcIp != ''">
@@ -413,25 +412,25 @@
 			    	<if test="dstPortMask != null and dstPortMask !=''">
 			    		AND r.DST_PORT_MASK=#{dstPortMask,jdbcType=VARCHAR}
 			    	</if> 
-			    	<if test="direction != null and direction!= ''">
+			    	<if test="direction != null">
 			    		AND r.DIRECTION=#{direction,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="protocol != null and protocol!=''">
+			    	<if test="protocol != null">
 			    		AND r.PROTOCOL=#{protocol,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="protocolId != null and protocolId !=''">
+			    	<if test="protocolId != null">
 			    		AND r.PROTOCOL_ID=#{protocolId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="action != null and action !=''">
+			    	<if test="action != null">
 			    		AND r.ACTION=#{action,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="isValid != null and isValid !=''">
+			    	<if test="isValid != null">
 			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="isValid == null and isValid !=''">
+			    	<if test="isValid == null">
 			    		AND r.IS_VALID != -1
 			    	</if>
-			    	<if test="isAudit != null and isAudit !=''">
+			    	<if test="isAudit != null">
 			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="creatorName != null and creatorName !=''">
@@ -452,16 +451,16 @@
 			    	<if test="auditTime != null and auditTime !=''">
 			    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
 			    	</if>
-			    	<if test="serviceId != null and serviceId !=''">
+			    	<if test="serviceId != null">
 			    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="requestId != null and requestId !=''">
+			    	<if test="requestId != null">
 			    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="compileId != null and compileId !=''">
+			    	<if test="compileId != null">
 			    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="isAreaEffective != null and isAreaEffective !=''">
+			    	<if test="isAreaEffective != null">
 			    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="classify != null and classify !=''">
@@ -478,7 +477,6 @@
 			    	</if>
 		  		</otherwise>
 	  		</choose>
-			
 		</trim>
 		<choose>
 			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -528,34 +526,34 @@
     update ${tableName}
     <set >
    	  <trim  suffixOverrides=",">
-	      <if test="cfgDesc != null" >
+	      <if test="cfgDesc != null and cfgDesc != ''" >
 	        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
 	      </if>
 	      <if test="ipType != null" >
 	        ip_type = #{ipType,jdbcType=INTEGER},
 	      </if>
-	      <if test="srcIp != null" >
+	      <if test="srcIp != null and srcIp != ''" >
 	        src_ip = #{srcIp,jdbcType=VARCHAR},
 	      </if>
-	      <if test="srcIpMask != null" >
+	      <if test="srcIpMask != null and srcIpMask != ''" >
 	        src_ip_mask = #{srcIpMask,jdbcType=VARCHAR},
 	      </if>
-	      <if test="srcPort != null" >
+	      <if test="srcPort != null and srcPort != ''" >
 	        src_port = #{srcPort,jdbcType=VARCHAR},
 	      </if>
-	      <if test="srcPortMask != null" >
+	      <if test="srcPortMask != null and srcPortMask != ''" >
 	        src_port_mask = #{srcPortMask,jdbcType=VARCHAR},
 	      </if>
-	      <if test="dstIp != null" >
+	      <if test="dstIp != null and dstIp != ''" >
 	        dst_ip = #{dstIp,jdbcType=VARCHAR},
 	      </if>
-	      <if test="dstIpMask != null" >
+	      <if test="dstIpMask != null and dstIpMask != ''" >
 	        dst_ip_mask = #{dstIpMask,jdbcType=VARCHAR},
 	      </if>
-	      <if test="dstPort != null" >
+	      <if test="dstPort != null and dstPort != ''" >
 	        dst_port = #{dstPort,jdbcType=VARCHAR},
 	      </if>
-	      <if test="srcPortMask != null" >
+	      <if test="srcPortMask != null and srcPortMask != ''" >
 	        dst_port_mask = #{srcPortMask,jdbcType=VARCHAR},
 	      </if>
 	      <if test="direction != null" >
@@ -579,19 +577,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" >
@@ -606,16 +604,16 @@
 	      <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="areaEffectiveIds != null" >
+	      <if test="areaEffectiveIds != null and areaEffectiveIds != ''" >
 	        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR}
 	      </if>
       </trim>
diff --git a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
index c95b9f089..663019d58 100644
--- a/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/basicInfo.jsp
@@ -28,20 +28,20 @@
                	<c:forEach items="${fls}" var="fl">
                		<c:choose>
                			<c:when test="${_cfg.classify==null or _cfg.classify==''}">
-               				<option value="${fl.itemCode}">${fl.itemValue}</option>
+               				<option value="${fl.serviceDictId}">${fl.itemValue}</option>
                			</c:when>
                			<c:when test="${fn:contains(_cfg.classify,',')}">
-               			<option value="${fl.itemCode}"
+               			<option value="${fl.serviceDictId}"
                				<c:forEach items="${fn:split(_cfg.classify,',')}" var="_classify">
 		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
-		               			<c:if test="${fl.itemCode==_classify}">selected</c:if>
+		               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
                				</c:forEach>
                			>${fl.itemValue}</option>	
                			</c:when>
                			<c:otherwise>
-               				<option value="${fl.itemCode}"
+               				<option value="${fl.serviceDictId}"
 		               			<c:if test="${fl.isValid==0}">disabled="disabled"</c:if>
-		               			<c:if test="${fl.itemCode==_classify}">selected</c:if>
+		               			<c:if test="${fn:trim(fl.serviceDictId) eq _classify}">selected</c:if>
 		               			>${fl.itemValue}</option>
                			</c:otherwise>
                		</c:choose>
@@ -62,13 +62,13 @@
                		<c:forEach items="${xzs}" var="xz">
 	               		<c:choose>
 	               			<c:when test="${_cfg.attribute==null or _cfg.attribute==''}">
-	               				<option value="${xz.itemCode}">${xz.itemValue}</option>
+	               				<option value="${xz.serviceDictId}">${xz.itemValue}</option>
 	               			</c:when>
 	               			<c:otherwise>
 	               				<c:forEach items="${fn:split(_cfg.attribute,',')}" var="_attribute">
-	               				<option value="${xz.itemCode}"
+	               				<option value="${xz.serviceDictId}"
 	               				<c:if test="${xz.isValid==0}">disabled="disabled"</c:if>
-	               		 		<c:if test="${xz.itemCode==_attribute}">selected</c:if>
+	               		 		<c:if test="${fn:trim(xz.serviceDictId) eq _attribute}">selected</c:if>
 	               				>${xz.itemValue}</option>
 	               				</c:forEach>
 	               			</c:otherwise>
@@ -86,13 +86,13 @@
                		<c:forEach items="${lables}" var="lable">
 	               		<c:choose>
 	               			<c:when test="${_cfg.lable==null or _cfg.lable==''}">
-	               				<option value="${lable.itemCode}">${lable.itemValue}</option>
+	               				<option value="${lable.serviceDictId}">${lable.itemValue}</option>
 	               			</c:when>
 	               			<c:otherwise>
 	               				<c:forEach items="${fn:split(_cfg.lable,',')}" var="_lable">
-	               					<option value="${lable.itemCode}"
+	               					<option value="${lable.serviceDictId}"
 			               			<c:if test="${lable.isValid==0}">disabled="disabled"</c:if>
-				               		<c:if test="${lable.itemCode==_lable}">selected</c:if>
+				               		<c:if test="${fn:trim(lable.serviceDictId) eq _lable}">selected</c:if>
 				               		>${lable.itemValue}</option>
 	               				</c:forEach>
 	               			</c:otherwise>
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 72030fa79..5cd144e66 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -154,7 +154,7 @@
 									<td>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
 										<c:forEach items="${fls}" var="fl">
-											<c:if test="${classifyId==fl.itemCode}">
+											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
 											${fl.itemValue},
 											</c:if>
 										</c:forEach>
@@ -164,14 +164,14 @@
 									<td>
 									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index d4d441021..5447598ff 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -21,19 +21,21 @@
 </c:choose>
 <script>
 	$(document).ready(function() {
-		
 		//筛选功能初始化
 		filterActionInit();
-		
 		$("#isAudit").change(function(){
 			page();
 		});
-		
-	
+		//rest
+		$("#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);
+			});
+			$("#searchForm")[0].reset();
+		});
 	});
-	function reset(){
- 		$("#searchForm").reset();
- 	}
 	//查询
  	function page(n,s){
 		$("#pageNo").val(n);
@@ -65,7 +67,10 @@
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/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}"/>
@@ -95,7 +100,7 @@
 									<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.itemCode}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+											<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
 										</c:forEach>
 									</form:select>
 								</div>
@@ -103,7 +108,7 @@
 									<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.itemCode}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+											<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
 										</c:forEach>
 									</form:select>
 								</div>
@@ -111,7 +116,7 @@
 									<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.itemCode}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+											<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
 										</c:forEach>
 									</form:select>
 								</div>
@@ -224,7 +229,7 @@
 									
 									<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" class="btn btn-default" onclick="reset()"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
+										<button type="button" id="resetBtn" class="btn btn-default"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 									</div>
 							
 								</div>
@@ -313,7 +318,7 @@
 									<td>
 									<c:forEach items="${fn:split(ipCfg.classify,',')}" var="classifyId">
 										<c:forEach items="${fls}" var="fl">
-											<c:if test="${classifyId==fl.itemCode}">
+											<c:if test="${fn:trim(fl.serviceDictId) eq classifyId}">
 											${fl.itemValue},
 											</c:if>
 										</c:forEach>
@@ -323,14 +328,14 @@
 									<td>
 									<c:forEach items="${fn:split(ipCfg.attribute,',')}" var="attributeId">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
+											<c:if test="${fn:trim(xz.serviceDictId) eq attributeId}">${xz.itemValue},</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(ipCfg.lable,',')}" var="lableId">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
+											<c:if test="${fn:trim(lable.serviceDictId) eq lableId}">${lable.itemValue},</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index b2abe4359..1d81a1fba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -152,7 +152,7 @@
 									<td>
 									<c:forEach items="${fn:split(cfg.classify,',')}" var="classifyId">
 										<c:forEach items="${fls}" var="fl">
-											<c:if test="${classifyId==fl.itemCode}">
+											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
 											${fl.itemValue},
 											</c:if>
 										</c:forEach>
@@ -162,14 +162,14 @@
 									<td>
 									<c:forEach items="${fn:split(cfg.attribute,',')}" var="attributeId">
 										<c:forEach items="${xzs}" var="xz">
-											<c:if test="${attributeId==xz.itemCode}">${xz.itemValue},</c:if>
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">${xz.itemValue},</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>
 									<td>
 									<c:forEach items="${fn:split(cfg.lable,',')}" var="lableId">
 										<c:forEach items="${lables}" var="lable">
-											<c:if test="${lableId==lable.itemCode}">${lable.itemValue},</c:if>
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">${lable.itemValue},</c:if>
 										</c:forEach>
 									</c:forEach>
 									</td>

From f02d7aca2027a4dbd6d591b13b785a2393cbe18d Mon Sep 17 00:00:00 2001
From: zhangshilin <zhangshilin@intranet>
Date: Mon, 12 Mar 2018 14:47:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=EF=BC=9A=20=20=20=20=20=E2=91=A0=E8=A7=A3=E5=86=B3=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=9D=A1=E4=BB=B6=E5=9B=9E=E4=BC=A0bug,=20=20=20=20?=
 =?UTF-8?q?=20=E2=91=A1=E5=88=97=E8=A1=A8=E5=BA=8F=E5=8F=B7=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=A7=E8=8F=9C=E5=8D=95=E4=B8=8D=E5=8F=82=E4=B8=8E=E4=B8=BB?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E8=AE=A1=E7=AE=97=EF=BC=8C=E4=B8=8B=E7=BA=A7?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E4=BB=A5=E6=A0=87=E8=AF=86=E7=AC=A6=E9=9A=94?=
 =?UTF-8?q?=E5=BC=80=EF=BC=8C=E6=A0=87=E8=AF=86=E7=AC=A6=E5=9C=A8=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E6=B7=BB=E5=8A=A0=20=20=20=20=20=E2=91=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=80=BB=E6=9D=A1=E6=95=B0=E6=8C=89=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=80=BB=E6=95=B0=E7=9B=AE=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=20=20=20=20=20=E2=91=A3=E8=8F=9C=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AD=E8=8B=B1=E6=96=87=20=E5=BE=85=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=9A=20=20=20=20=20=E2=91=A0=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E6=9D=A1=E4=BB=B6=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=A1=A8=E5=8D=95=E9=87=8D=E7=BD=AE=E6=97=B6=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=97=A0=E6=B3=95=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/Page.java        |  2 +-
 .../nis/domain/basics/ServiceDictInfo.java    | 40 +++++++++++++++++++
 .../com/nis/domain/basics/SysDictInfo.java    | 39 +++++++++++++++++-
 .../basics/ServiceDictInfoController.java     | 19 ++++++++-
 .../basics/SysDictInfoController.java         | 19 ++++++++-
 .../basics/ServiceDictInfoService.java        |  1 +
 .../resources/messages/message_en.properties  |  5 +++
 .../messages/message_zh_CN.properties         |  5 +++
 src/main/resources/nis.properties             |  8 ++--
 .../basics/serviceDictInfoSearchList.jsp      | 12 +++---
 .../WEB-INF/views/basics/serviceDictList.jsp  | 10 ++---
 .../views/basics/sysDictInfoSearchList.jsp    | 10 ++---
 .../WEB-INF/views/basics/sysDictList.jsp      | 10 ++---
 13 files changed, 151 insertions(+), 29 deletions(-)

diff --git a/src/main/java/com/nis/domain/Page.java b/src/main/java/com/nis/domain/Page.java
index e3055a5a5..12c4ce974 100644
--- a/src/main/java/com/nis/domain/Page.java
+++ b/src/main/java/com/nis/domain/Page.java
@@ -379,7 +379,7 @@ public class Page<T> {
 		sb.append(funcName+"(this.value,"+pageSize+",'"+funcParam+"');\" onclick=\"this.select();\"/> / ");
 		sb.append("<input type=\"text\" value=\""+last+"\" onkeypress=\"var e=window.event||this;var c=e.keyCode||e.which;if(c==13)");
 		sb.append(funcName+"("+pageNo+",this.value,'"+funcParam+"');\" onclick=\"this.select();\"/> 页，");
-		sb.append("共 " + count + " 条"+(message!=null?message:"")+"</a></li>\n");
+		sb.append("共 <span id='showTotalCount'>" + count + "</span> 条"+(message!=null?message:"")+"</a></li>\n");
 
 		sb.insert(0,"<ul>\n").append("</ul>\n");
 		
diff --git a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
index ea283d5e3..738bc8f5d 100644
--- a/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
+++ b/src/main/java/com/nis/domain/basics/ServiceDictInfo.java
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.BaseEntity;
 import com.nis.domain.SysMenu;
 import com.nis.domain.SysUser;
+import com.nis.util.Configurations;
 /**
  * 业务辅助表-业务字典信息表
  * @author zsl
@@ -39,6 +40,8 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	private Date editBeginDate;		// 修改开始日期
 	private Date editEndDate;		// 修改结束日期
 	
+	private String showSequence;  //显示序号
+	
 	
 	public Integer getServiceDictId() {
 		return serviceDictId;
@@ -150,6 +153,12 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 	public void setEditEndDate(Date editEndDate) {
 		this.editEndDate = editEndDate;
 	}
+	public String getShowSequence() {
+		return showSequence;
+	}
+	public void setShowSequence(String showSequence) {
+		this.showSequence = showSequence;
+	}
 	@JsonIgnore
 	public static void sortList(List<ServiceDictInfo> list, List<ServiceDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){
@@ -198,4 +207,35 @@ public class ServiceDictInfo extends BaseEntity<ServiceDictInfo>{
 		return listTemp.size();
 	}
 	
+	//处理下级序号
+	public static void addChildrenSeq(List<ServiceDictInfo> list,Integer parentId){
+		    int countNo = 1;
+			for(int i=0; i<list.size(); i++){
+				ServiceDictInfo serviceDictInfo = list.get(i);
+				if(serviceDictInfo.getParent()!=null && serviceDictInfo.getParent().getServiceDictId()!=null
+						&& serviceDictInfo.getParent().getServiceDictId().equals(parentId)){
+					//找出该父类
+					for(ServiceDictInfo se:list){
+						if(se.getServiceDictId()==parentId){
+							serviceDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
+							countNo++;
+						}
+					}
+					//继续获取子节点
+					for (int j=0; j<list.size(); j++){
+						ServiceDictInfo child = list.get(j);
+						if (child.getParent()!=null && child.getParent().getServiceDictId()!=null
+								&& child.getParent().getServiceDictId().equals(serviceDictInfo.getServiceDictId())){
+							addChildrenSeq(list, serviceDictInfo.getServiceDictId());
+							break;
+						}
+					}
+				}
+				
+			}
+		
+		
+		
+	}
+	
 }
diff --git a/src/main/java/com/nis/domain/basics/SysDictInfo.java b/src/main/java/com/nis/domain/basics/SysDictInfo.java
index 832e8bf2b..3b2b5d9c3 100644
--- a/src/main/java/com/nis/domain/basics/SysDictInfo.java
+++ b/src/main/java/com/nis/domain/basics/SysDictInfo.java
@@ -7,6 +7,7 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.nis.domain.BaseEntity;
 import com.nis.domain.SysUser;
+import com.nis.util.Configurations;
 /**
  * 业务辅助表-系统字典信息表
  * @author zsl
@@ -37,6 +38,7 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	private Date editBeginDate;		// 修改开始日期
 	private Date editEndDate;		// 修改结束日期
 	
+	private String showSequence; //显示序号
 
 
 	public Integer getSysDictId() {
@@ -147,7 +149,12 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 	public void setEditEndDate(Date editEndDate) {
 		this.editEndDate = editEndDate;
 	}
-
+	public void setShowSequence(String showSequence) {
+		this.showSequence = showSequence;
+	}
+	public String getShowSequence() {
+		return showSequence;
+	}
 	@JsonIgnore
 	public static void sortList(List<SysDictInfo> list, List<SysDictInfo> sourcelist, Integer parentId, boolean cascade){
 		for (int i=0; i<sourcelist.size(); i++){
@@ -169,5 +176,33 @@ public class SysDictInfo extends BaseEntity<SysDictInfo>{
 			}
 		}
 	}
-
+	
+	//处理下级序号
+	public static void addChildrenSeq(List<SysDictInfo> list,Integer parentId){
+		    int countNo = 1;
+			for(int i=0; i<list.size(); i++){
+				SysDictInfo sysDictInfo = list.get(i);
+				if(sysDictInfo.getParent()!=null && sysDictInfo.getParent().getSysDictId()!=null
+						&& sysDictInfo.getParent().getSysDictId().equals(parentId)){
+					//找出该父类
+					for(SysDictInfo se:list){
+						if(se.getSysDictId()==parentId){
+							sysDictInfo.setShowSequence(se.getShowSequence()+Configurations.getStringProperty("childrenMark", ".")+countNo);
+							countNo++;
+						}
+					}
+					//继续获取子节点
+					for (int j=0; j<list.size(); j++){
+						SysDictInfo child = list.get(j);
+						if (child.getParent()!=null && child.getParent().getSysDictId()!=null
+								&& child.getParent().getSysDictId().equals(sysDictInfo.getSysDictId())){
+							addChildrenSeq(list, sysDictInfo.getSysDictId());
+							break;
+						}
+					}
+				}
+				
+			}
+	
+	}
 }
diff --git a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
index c2f3e41d4..595c55950 100644
--- a/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/ServiceDictInfoController.java
@@ -60,6 +60,7 @@ public class ServiceDictInfoController extends BaseController {
 	
 	/**
 	 * 查询业务辅助表-业务字典信息列表(无条件分页查询)
+	 * （修改内容：添加查询数据总数，添加原则：不得修改原对象引用参数，不得影响原分页参数page数据）
 	 * @param serviceDictInfo
 	 * @param request
 	 * @param response
@@ -82,9 +83,16 @@ public class ServiceDictInfoController extends BaseController {
 			model.addAttribute("selectedType", selectedType);
 			serviceDictInfo.setItemType(selectedType);
 		}
+		//查询符合条件总数
+		List<ServiceDictInfo> showTotalCount = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
+		model.addAttribute("showTotalCount", showTotalCount.size());
 		
 		//查出顶层分页数据
 		Page<ServiceDictInfo> page = serviceDictInfoService.findTopDictList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
+		//植入序号
+		for(int i=0;i<page.getList().size();i++){
+		    page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
+		}
 		model.addAttribute("page", page);
 		//查出所有数据
 		List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictList();
@@ -99,7 +107,8 @@ public class ServiceDictInfoController extends BaseController {
 		allList.addAll(page.getList());
 		ServiceDictInfo.sortList(list,allList,0,true);
 		
-		
+		//处理下级序号
+		ServiceDictInfo.addChildrenSeq(list, 0);
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("list", list);
@@ -156,9 +165,13 @@ public class ServiceDictInfoController extends BaseController {
 		
 		//先查出条件查询所有数据（注意顺序）
 		List<ServiceDictInfo> allList = serviceDictInfoService.findAllDictSearchList(serviceDictInfo,intArr);
-				
+		model.addAttribute("showTotalCount", allList.size());
 		//查出条件查询顶层分页数据
 		Page<ServiceDictInfo> page = serviceDictInfoService.findDictTopSearchList(new Page<ServiceDictInfo>(request, response), serviceDictInfo,intArr);
+		//植入序号
+		for(int i=0;i<page.getList().size();i++){
+			page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
+		}
 		model.addAttribute("page", page);
 		
 		//处理数据，保留顶层中的所有下层数据
@@ -182,6 +195,8 @@ public class ServiceDictInfoController extends BaseController {
 		
 		allList.addAll(page.getList());
 		ServiceDictInfo.sortList(list,allList,0,true);
+		//处理下级序号
+		ServiceDictInfo.addChildrenSeq(list, 0);
 		//serviceDictInfo.setItemType(selectedType);
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
diff --git a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
index 80a336a82..55232636e 100644
--- a/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
+++ b/src/main/java/com/nis/web/controller/basics/SysDictInfoController.java
@@ -19,6 +19,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.Page;
+import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.util.Configurations;
 import com.nis.util.StringUtil;
@@ -81,9 +82,16 @@ public class SysDictInfoController extends BaseController {
 			model.addAttribute("selectedType", selectedType);
 			sysDictInfo.setItemType(selectedType);
 		}
+		//查询符合条件总数
+		List<SysDictInfo> showTotalCount = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
+		model.addAttribute("showTotalCount", showTotalCount.size());
 		
 		//查出顶层分页数据
 		Page<SysDictInfo> page = sysDictInfoService.findTopDictList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
+		//植入序号
+		for(int i=0;i<page.getList().size();i++){
+			page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
+		}
 		model.addAttribute("page", page);
 		//查出所有数据
 		List<SysDictInfo> allList = sysDictInfoService.findAllDictList();
@@ -98,6 +106,8 @@ public class SysDictInfoController extends BaseController {
 		allList.addAll(page.getList());
 		SysDictInfo.sortList(list,allList,0,true);
 		
+		//处理下级序号
+		SysDictInfo.addChildrenSeq(list, 0);
 		model.addAttribute("itType", itType);
 		model.addAttribute("intArr", Arrays.asList(intArr));
 		model.addAttribute("list", list);
@@ -152,9 +162,13 @@ public class SysDictInfoController extends BaseController {
 		model.addAttribute("searchContent", searchContent);
 		//先查出条件查询所有数据（注意顺序）
 		List<SysDictInfo> allList = sysDictInfoService.findAllDictSearchList(sysDictInfo,intArr);
-						
+		model.addAttribute("showTotalCount", allList.size());
 		//查出条件查询顶层分页数据
 		Page<SysDictInfo> page = sysDictInfoService.findDictTopSearchList(new Page<SysDictInfo>(request, response), sysDictInfo,intArr);
+		//植入序号
+		for(int i=0;i<page.getList().size();i++){
+			page.getList().get(i).setShowSequence(""+(i+1+((page.getPageNo()-1)*page.getPageSize())));
+		}
 		model.addAttribute("page", page);
 				
 		//处理数据，保留顶层中的所有下层数据
@@ -186,6 +200,9 @@ public class SysDictInfoController extends BaseController {
 		allList.addAll(page.getList());
 		SysDictInfo.sortList(list,allList,0,true);
 		
+		
+		//处理下级序号
+		SysDictInfo.addChildrenSeq(list, 0);
 		/*for(int i=list.size()-1;i>=0;i--){
 			SysDictInfo se = list.get(i);
 			System.out.println("最终顺序"+se.getSysDictId()+":"+se.getParent().getSysDictId());
diff --git a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
index 93813be7f..33d873c28 100644
--- a/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
+++ b/src/main/java/com/nis/web/service/basics/ServiceDictInfoService.java
@@ -471,5 +471,6 @@ public class ServiceDictInfoService extends BaseService{
 
 
 
+
 	
 }
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index f2ac9a917..eea83a3c6 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -46,6 +46,11 @@ dns_monitor=dns monitor
 basic_configuration=basic configuration
 letter_from=letter from
 classification=classification
+classification_manage=classification_manage
+attribute_manage=attribute_manage
+area_manage=area_manage
+isp_manage=isp_manage
+feature_scope_manage=feature_scope_manage
 special_tasks=special tasks
 label_manage=label manage
 protect_list=protect list
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index ad3d3e7b3..ae12e8bc9 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -44,6 +44,11 @@ dns_monitor=DNS\u7ba1\u63a7
 basic_configuration=\u57fa\u672c\u914d\u7f6e
 letter_from=\u6765\u51fd\u5355\u4f4d
 classification=\u5206\u7c7b\u6027\u8d28
+classification_manage=\u5206\u7c7b\u7ba1\u7406
+attribute_manage=\u6027\u8d28\u7ba1\u7406
+area_manage=\u5730\u57df\u7ba1\u7406
+isp_manage=\u8fd0\u8425\u5546\u7ba1\u7406
+feature_scope_manage=\u7279\u5f81\u4f5c\u7528\u57df\u7ba1\u7406
 special_tasks=\u4e13\u9879\u4efb\u52a1
 label_manage=\u6807\u7b7e\u7ba1\u7406
 protect_list=\u4fdd\u62a4\u540d\u5355
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index eb0868d27..515abe4de 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -5,7 +5,7 @@ adminPath=/nis
 servicePath=/service
 
 #\u5206\u9875\u914d\u7f6e
-page.pageSize=5
+page.pageSize=20
 #\u5206\u9875\u914d\u7f6e
 page.count=0
 
@@ -235,5 +235,7 @@ jdbc.hive.AName=xa_dfbhit_hive
 jdbc.hive.BName=xa_z2_mesalog_hive
 
 maxPageSize=100000
-
-maxLevelNo=4
\ No newline at end of file
+#允许配置最大层级
+maxLevelNo=4
+#上下级显示间隔标识符
+childrenMark=.
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
index 75d509ca5..bd60d355a 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictInfoSearchList.jsp
@@ -4,7 +4,7 @@
 <head>
 <title>配置信息</title>
 <link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
-<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
+<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
 	<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
 	<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
 	<script type="text/javascript">
@@ -68,7 +68,9 @@
 		return false;
 	}
 		$(document).ready(function() {
-			
+
+			//设定显示总条数
+			$("#showTotalCount").text('${showTotalCount}');
 			//设定selected，设定name  设定value
 			
 				$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
@@ -211,14 +213,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" 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 id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>
@@ -268,7 +270,7 @@
 							<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
 											<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
 												<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
-												<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
+												<td>${serviceDictInfo.showSequence}</td>
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
 												<td>${serviceDictInfo.itemValue}</td>
 												<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
index 983603046..4c71d4a1a 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
@@ -4,7 +4,7 @@
 <head>
 <title>配置信息</title>
 <link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
-<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
+<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
 	<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
 	<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
 	<script type="text/javascript">
@@ -70,7 +70,7 @@
 		$(document).ready(function() {
 			
 			//设定显示总条数
-			//$("#showTotalCount").text();
+			$("#showTotalCount").text('${showTotalCount}');
 			//设定selected，设定name  设定value
 			
 				$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
@@ -213,14 +213,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.editBeginDate}" 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 id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${serviceDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${serviceDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>
@@ -270,7 +270,7 @@
 							<c:forEach items="${list}" var="serviceDictInfo" varStatus="se">
 											<tr id="${serviceDictInfo.serviceDictId}" pId="${serviceDictInfo.parent.serviceDictId ne 0?serviceDictInfo.parent.serviceDictId:0}">
 												<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
-												<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
+												<td>${serviceDictInfo.showSequence}</td>
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td>
 												<td>${serviceDictInfo.itemValue}</td>
 												<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
index e0b8947c5..3ed54ae81 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictInfoSearchList.jsp
@@ -4,7 +4,7 @@
 <head>
 <title>配置信息</title>
 <link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
-<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
+<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
 	<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
 	<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
 	<script type="text/javascript">
@@ -70,7 +70,7 @@
     	}
     	$(document).ready(function() {
     		//设定显示总条数
-			//$("#showTotalCount").text();
+			$("#showTotalCount").text('${showTotalCount}');
 			//设定selected，设定name  设定value
 			
 				$("#seltype").find("option[value=${searchType==null?11:searchType}]").attr("selected",true);
@@ -211,14 +211,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" 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 id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>
@@ -268,7 +268,7 @@
 							<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
 												<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
-												<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
+												<td>${sysDictInfo.showSequence}</td>
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
 												<td>${sysDictInfo.itemValue}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 90a16a33d..4b852b0a8 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -4,7 +4,7 @@
 <head>
 <title>配置信息</title>
 <link href="${ctxStatic}/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
-<link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" />
+<%-- <link href="${ctxStatic}/pages/css/dictInfo.css" rel="stylesheet" type="text/css" /> --%>
 	<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
 	<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
 	<script type="text/javascript">
@@ -74,7 +74,7 @@
     	}
     	$(document).ready(function() {
     		//设定显示总条数
-			//$("#showTotalCount").text();
+			$("#showTotalCount").text('${showTotalCount}');
 			//设定selected，设定name  设定value
 			
 				$("#seltype").find("option[value='${searchType==null?11:searchType}']").attr("selected",true);
@@ -216,14 +216,14 @@
 										</div>
 										<div class="pull-left">
 											<input id="editBeginDate" name="editBeginDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.beginDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.editBeginDate}" 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 id="editEndDate" name="editEndDate" type="text" readonly="readonly" maxlength="20" class="form-control input-small Wdate"
-											value="<fmt:formatDate value="${sysDictInfo.endDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
+											value="<fmt:formatDate value="${sysDictInfo.editEndDate}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div> 
 								</div>
@@ -273,7 +273,7 @@
 							<c:forEach items="${list}" var="sysDictInfo" varStatus="se">
 											<tr id="${sysDictInfo.sysDictId}" pId="${sysDictInfo.parent.sysDictId ne 0?sysDictInfo.parent.sysDictId:0}">
 												<td><input type="checkbox" class="ckbox" name="check" value="${sysDictInfo.sysDictId}"></td>
-												<td>${fns:getNumberResult(se.count,page.pageNo,page.pageSize) }</td>
+												<td>${sysDictInfo.showSequence}</td>
 												<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/sysDictInfo/form?sysDictId=${sysDictInfo.sysDictId}&doAction=0">${sysDictInfo.itemCode}</a></td>
 												<td>${sysDictInfo.itemValue}</td>
 												<td title="${sysDictInfo.itemDesc}">${fns:abbr(sysDictInfo.itemDesc,15)}</td>

From d842c773ec11ce452850bb2bd0e3aa7c95e2ba39 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 12 Mar 2018 15:22:52 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A3=80=E7=B4=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/StringCfgController.java    |   6 +-
 .../web/dao/configuration/StringCfgDao.xml    | 268 ++++++++++++------
 .../WEB-INF/include/form/stringInfo.jsp       |  16 +-
 .../webapp/WEB-INF/views/cfg/ipCfgList.jsp    |   4 +-
 .../WEB-INF/views/cfg/stringCfgList.jsp       | 211 +++++++++++---
 5 files changed, 356 insertions(+), 149 deletions(-)

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 fbd83d76c..2430efdc8 100644
--- a/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/StringCfgController.java
@@ -13,10 +13,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.BaseStringCfg;
 import com.nis.domain.configuration.RequestInfo;
-import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.util.Constants;
 import com.nis.web.controller.BaseController;
 
@@ -44,11 +44,11 @@ public class StringCfgController extends BaseController{
 					if(!StringUtils.isBlank(tableName)){
 						logger.info("table name is "+tableName);
 						stringCfg.setTableName(tableName);
-						Page<BaseStringCfg> page = stringCfgService.findPage(new Page<BaseStringCfg>(request,response), stringCfg);
+						Page<BaseStringCfg> page = stringCfgService.findPage(new Page<BaseStringCfg>(request,response,"r"), stringCfg);
 						model.addAttribute("page", page);
 						model.addAttribute("action", stringCfg.getAction());
 						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);
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 36afe76a7..acd47fec2 100644
--- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
@@ -61,12 +61,29 @@
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN
   </sql>
-  <sql id="BaseStringCfg_Column_List_with_id_alias" >
+  <!-- <sql id="BaseStringCfg_Column_List_with_id_alias" >
     r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, 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="BaseStringCfg_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}.CFG_KEYWORDS as cfgKeywords,${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}.AREA_EFFECTIVE_IDS AS areaEffectiveIds
+  		</when>
+  		<otherwise>
+  			 r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc, r.CFG_KEYWORDS as cfgKeywords, 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="BaseStringCfg_Column_List" >
     CFG_DESC, CFG_KEYWORDS, ACTION,IS_VALID,IS_AUDIT,
@@ -166,16 +183,10 @@
     	</if>
     </trim>
   </select>
+  
   <select id="findList" resultMap="BaseStringMapWithUser">
 		select 
-		<!--<choose>
-			 <when test="page !=null and page.fields != null and page.fields != ''">
-				 ${page.fields}
-			</when> 
-			<otherwise>-->
-				<include refid="BaseStringCfg_Column_List_with_id_alias"/>	
-			<!-- </otherwise>
-		</choose> -->
+		<include refid="BaseStringCfg_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
@@ -189,82 +200,159 @@
 		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
 		<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="cfgKeywords != null">
-    			AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,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="cfgKeywords != null and cfgKeywords != ''">
+		    			AND ${page.alias}.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,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="cfgKeywords != null and cfgKeywords != ''">
+		    			AND r.CFG_KEYWORDS like concat(concat('%',#{cfgKeywords,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 != ''">
@@ -314,10 +402,10 @@
     update ${tableName}
     <set >
       <trim suffixOverrides=",">
-      <if test="cfgDesc != null" >
+      <if test="cfgDesc != null and cfgDesc != ''" >
         cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
       </if>
-      <if test="cfgKeywords != null">
+      <if test="cfgKeywords != null and cfgKeywords != ''">
     	cfg_keywords = #{cfgKeywords,jdbcType=VARCHAR},
       </if>
       <if test="action != null" >
@@ -338,13 +426,13 @@
       <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" >
@@ -359,13 +447,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">
@@ -377,7 +465,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/webapp/WEB-INF/include/form/stringInfo.jsp b/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
index e805126bd..e56366b44 100644
--- a/src/main/webapp/WEB-INF/include/form/stringInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/stringInfo.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>
@@ -13,7 +13,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="cfgKeywords" value="${_cfg.cfgKeywords}">
             </div>
         </div>
@@ -23,7 +23,7 @@
 	<div class="col-md-6">
 	    <div class="form-group ">
 	            <label class="control-label col-md-3"><spring:message code="block_type"/></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> ><spring:message code="block"/></option>                       
             	 	<option value="2" <c:if test="${_cfg.action==2}">selected</c:if><c:if test="${_cfg.action!=2}">disabled="disabled"</c:if> ><spring:message code="monitor"/></option>                     
@@ -39,7 +39,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>
@@ -59,7 +59,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>
@@ -76,7 +76,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="--请选择--" >
 					<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>       
@@ -91,7 +91,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>
@@ -103,7 +103,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/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 5447598ff..370c63578 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -26,7 +26,7 @@
 		$("#isAudit").change(function(){
 			page();
 		});
-		//rest
+		//reset
 		$("#resetBtn").on("click",function(){
 			$("select.selectpicker").each(function(){
 				$(this).selectpicker('val',$(this).find('option:first').val());
@@ -61,7 +61,7 @@
 		<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">
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 1d81a1fba..a45e2a6a8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -21,8 +21,21 @@
 </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);
+			});
+			$("#cfgKeywords").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
  	});
 	//查询
  	function page(n,s){
@@ -37,68 +50,174 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/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/string/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/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
+			onClick="javascript:window.location='${ctx}/cfg/string/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
 		</c:if>
 	</div>
 
 	<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/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/string/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" title="--请选择--" >
-									<form:option value=""></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>
-								<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="cfgKeywords" 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">