配置界面的Cfg Id检索条件 增加范围和in的检索方式

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -61,6 +61,11 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected Integer compileIsIssued;
 	protected String exType;//导出类型
 	protected String hColumns;//导出隐藏列
+	
+	protected Integer compileIdStart;//配置ID 查询范围 开始
+	protected Integer compileIdEnd;//配置ID 查询范围 结束
+	protected String compileIdNew;// 查询 配置ID 范围
+	protected List<String> compileIdNewList; //查询范围（1,2,3）
 	/**
 	 * 定时任务信息
 	 */
@@ -108,6 +113,30 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 		this.compileGroupMap = compileGroupMap;
 	}
 	
+	public Integer getCompileIdStart() {
+		return compileIdStart;
+	}
+	public void setCompileIdStart(Integer compileIdStart) {
+		this.compileIdStart = compileIdStart;
+	}
+	public Integer getCompileIdEnd() {
+		return compileIdEnd;
+	}
+	public void setCompileIdEnd(Integer compileIdEnd) {
+		this.compileIdEnd = compileIdEnd;
+	}
+	public String getCompileIdNew() {
+		return compileIdNew;
+	}
+	public void setCompileIdNew(String compileIdNew) {
+		this.compileIdNew = compileIdNew;
+	}
+	public List<String> getCompileIdNewList() {
+		return compileIdNewList;
+	}
+	public void setCompileIdNewList(List<String> compileIdNewList) {
+		this.compileIdNewList = compileIdNewList;
+	}
 	/**
 	 * 编译id
 	 */

src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java

@@ -484,13 +484,15 @@ public class IpMultiplexController extends CommonController {
 			for (Integer id : set) {
 				serviceIds.append(id+",");
 			}
-			String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
+			if(serviceIds.length()>1&&compileIds.length()>1){
-			String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
+				String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
-			//获取日志总量
+				String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
-			if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
+				//获取日志总量
-				List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
+				if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
-				logTotals.addAll(logs);
+					List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
-			}			
+					logTotals.addAll(logs);
+				}
+			}	
 			List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
 			for (IpReusePolicyCfg ipReusePolicyCfg : ipLists) {
 				if(ipReusePolicyCfg.getAddrPoolId()!=null){
@@ -604,12 +606,15 @@ public class IpMultiplexController extends CommonController {
 			for (Integer id : set) {
 				serviceIds.append(id+",");
 			}
-			String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
+			
-			String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
+			if(serviceIds.length()>1&&compileIds.length()>1){
-			//获取日志总量
+				String serviceIdsStr=serviceIds.toString().substring(1, serviceIds.length()-1);
-			if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
+				String compileIdsStr=compileIds.toString().substring(1, compileIds.length()-1);
-				List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
+				//获取日志总量
-				logTotals.addAll(logs);
+				if(!StringUtils.isBlank(serviceIdsStr)&&!StringUtils.isBlank(compileIdsStr)){
+					List<Map<String,Object>> logs = getLogTotal( null,serviceIdsStr,compileIdsStr);
+					logTotals.addAll(logs);
+				}
 			}	
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), IpReuseDnatPolicyCfg.class);

src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml

@@ -761,6 +761,16 @@
 	    	<if test="compileId != null">
 	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>
@@ -931,6 +941,16 @@
 	    	<if test="compileId != null">
 	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="compileGroupMap != null">
 			        and r.COMPILE_ID in 
 			       	<foreach collection="compileGroupMap.keys" index="index" item="compileId" open="(" separator="," close=")">
@@ -1140,6 +1160,16 @@
 	    	<if test="compileId != null">
 	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>
@@ -1241,6 +1271,16 @@
 	    	<if test="compileId != null">
 	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>
@@ -1539,6 +1579,16 @@
 	    	<if test="compileId != null">
 	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml

@@ -308,6 +308,16 @@
 	    	<if test="compileId != null">
 	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml

@@ -164,6 +164,16 @@
     	<if test="compileId != null">
     		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
     	</if>
+    	<if test="compileIdStart != null and compileIdEnd != null">
+    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+    	</if>
+    	<if test="compileIdNewList !=null">
+    		AND a.COMPILE_ID in 
+    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+					#{id}
+			</foreach>
+    	</if>
     	<if test="isAreaEffective != null">
     		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
     	</if>

src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml

@@ -352,6 +352,16 @@
 	    	<if test="compileId != null">
 	    		AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml

@@ -234,6 +234,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml

@@ -245,6 +245,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>
@@ -917,6 +927,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml

@@ -252,6 +252,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>
@@ -696,6 +706,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>
@@ -1130,6 +1150,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml

@@ -1105,6 +1105,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.xml

@@ -128,6 +128,16 @@
 	    	<if test="compileId != null">
 	   			AND r.compile_id=#{compileId,jdbcType=BIGINT}
 	   		</if>
+	   		<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND r.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND r.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND r.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	   		<if test="srcIpAddress != null and srcIpAddress != ''">
 	   			AND r.src_ip_address=#{srcIpAddress,jdbcType=VARCHAR}
 	   		</if>
@@ -638,6 +648,16 @@
 	    	<if test="compileId != null">
 	   			AND a.compile_id=#{compileId,jdbcType=BIGINT}
 	   		</if>
+	   		<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	   		<if test="srcIpAddress != null and srcIpAddress != ''">
     			AND a.original_dest_ip=#{srcIpAddress,jdbcType=VARCHAR}
     	  	</if>

src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml

@@ -196,6 +196,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml

@@ -215,6 +215,16 @@
 	    	<if test="compileId != null">
 	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
 	    	</if>
+	    	<if test="compileIdStart != null and compileIdEnd != null">
+	    		AND a.COMPILE_ID &gt;= #{compileIdStart,jdbcType=INTEGER}
+	    		AND a.COMPILE_ID &lt;= #{compileIdEnd,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileIdNewList !=null">
+	    		AND a.COMPILE_ID in 
+	    		<foreach collection="compileIdNewList" index="index" item="id" open="(" separator="," close=")">
+						#{id}
+				</foreach>
+	    	</if>
 	    	<if test="isAreaEffective != null">
 	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
 	    	</if>

src/main/java/com/nis/web/service/configuration/AppCfgService.java

@@ -88,6 +88,29 @@ public class AppCfgService extends BaseService {
 	protected AsnIpCfgDao asnIpCfgDao;
 
 	public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
 		List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
@@ -102,6 +125,29 @@ public class AppCfgService extends BaseService {
 	
 	
 	public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
@@ -132,6 +178,29 @@ public class AppCfgService extends BaseService {
 	}
 
 	public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
 		List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
@@ -156,6 +225,29 @@ public class AppCfgService extends BaseService {
 
 	// 主题网站列表
 	public Page<AppTopicDomainCfg> findAppTopicDomainList(Page<AppTopicDomainCfg> page, AppTopicDomainCfg entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
 		List<AppTopicDomainCfg> list = appCfgDao.findAppTopicDomainList(entity);
@@ -180,6 +272,29 @@ public class AppCfgService extends BaseService {
 	}
 
 	public Page<AppSslCertCfg> findAppSslList(Page<AppSslCertCfg> page, AppSslCertCfg entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
 		List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity);

src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java

@@ -58,6 +58,29 @@ public class AppMultiFeatureCfgService extends BaseService {
 
 	//分页查询
 	public Page<AppFeatureIndex> findAppFeatureIndexList(Page<AppFeatureIndex> page, AppFeatureIndex entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
 		List<AppFeatureIndex> list = appMultiFeatureCfgDao.findAppFeatureIndexList(entity);

src/main/java/com/nis/web/service/configuration/AvCfgService.java

@@ -59,6 +59,29 @@ public class AvCfgService extends BaseService{
 		return avCfgDao.getAvSignSampleById(cfgId);
 	}
 	public Page<AvFileSampleCfg> getAvFileSampleList(Page<AvFileSampleCfg> page, AvFileSampleCfg entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/java/com/nis/web/service/configuration/AvContentCfgService.java

@@ -72,6 +72,29 @@ public class AvContentCfgService extends BaseService{
 	 * @return
 	 */
 	public Page<CfgIndexInfo> findPage(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<CfgIndexInfo> list=avContentCfgDao.findVoipList(entity);

src/main/java/com/nis/web/service/configuration/BgpCfgService.java

@@ -64,6 +64,29 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 		return entity;
 	}
 	public Page<CfgIndexInfo> getBgpList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/java/com/nis/web/service/configuration/CachePolicyService.java

@@ -73,6 +73,29 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 	}
 	
 	public Page<CachePolicyUserRegion> getCachePolicyUserRegionList(Page<CachePolicyUserRegion> page, CachePolicyUserRegion entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);
 		List<CachePolicyUserRegion> list = commonPolicyDao.getCachePolicyUserRegionList(entity);
@@ -154,6 +177,29 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 	}
 	
 	public Page<CfgIndexInfo> getCachePolicyList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/java/com/nis/web/service/configuration/DomainService.java

@@ -661,6 +661,29 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 				}
 	}
 	public Page<CfgIndexInfo> getDomainList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java

@@ -66,6 +66,29 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 	protected StringCfgDao stringCfgDao;
 	
 	public Page<CfgIndexInfo> getFtpList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);
@@ -393,6 +416,29 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 	}
 	
 	public Page<FileDigestCfg> getFileDigestList(Page<FileDigestCfg> page, FileDigestCfg entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);
@@ -677,6 +723,29 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 	}
 	
 	public Page<CfgIndexInfo> getP2pList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java

@@ -101,6 +101,29 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 	}
 	
 	public Page<CfgIndexInfo> getHttpRedirectList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/java/com/nis/web/service/configuration/IpCfgService.java

@@ -1001,6 +1001,29 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		return msgProp;
 	}
 	public Page<CfgIndexInfo> getIpCfgList(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);
 		List<CfgIndexInfo> list = ipCfgDao.getIpCfgList(entity);

src/main/java/com/nis/web/service/configuration/IpMultiplexService.java

@@ -1,5 +1,6 @@
 package com.nis.web.service.configuration;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -23,6 +24,7 @@ import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
+import com.nis.util.StringUtil;
 import com.nis.util.StringUtils;
 import com.nis.web.dao.configuration.IpMultiplexDao;
 import com.nis.web.security.UserUtils;
@@ -37,6 +39,29 @@ public class IpMultiplexService extends BaseService{
 	private IpMultiplexDao ipMultiplexDao;
 
 	public Page<IpReusePolicyCfg> findPage(Page<IpReusePolicyCfg> page, IpReusePolicyCfg entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<IpReusePolicyCfg> list=ipMultiplexDao.findPage(entity);
@@ -283,6 +308,29 @@ public class IpMultiplexService extends BaseService{
 	}
 
 	public Page<BaseIpCfg> findPageDnat(Page<BaseIpCfg> page, IpReuseDnatPolicyCfg entity) {
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);
 		List<BaseIpCfg> list=ipMultiplexDao.findPageDnat(entity);

src/main/java/com/nis/web/service/configuration/MailCfgService.java

@@ -37,6 +37,7 @@ import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
 import com.nis.util.JsonMapper;
+import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
 import com.nis.web.dao.configuration.MailCfgDao;
 import com.nis.web.dao.configuration.StringCfgDao;
@@ -59,6 +60,29 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 	
 	
 	public Page<CfgIndexInfo> getMailList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.nis.domain.Page;
+import com.nis.domain.SysUser;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
@@ -165,6 +166,29 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		return entity;
 	}
 	public Page<CfgIndexInfo> getWebsiteList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		//配置ID 查询条件   查询范围的处理 
+		String compileIdNew =entity.getCompileIdNew();
+		if(!StringUtil.isEmpty(compileIdNew)){
+			if(compileIdNew.indexOf("-")!=-1){//包含
+				String[] split = compileIdNew.split("-");
+				if(Integer.parseInt(split[0]) < Integer.parseInt(split[1])){
+					entity.setCompileIdStart(Integer.parseInt(split[0]));
+					entity.setCompileIdEnd(Integer.parseInt(split[1]));
+				}else{
+					entity.setCompileIdStart(Integer.parseInt(split[1]));
+					entity.setCompileIdEnd(Integer.parseInt(split[0]));
+				}
+			}else if(compileIdNew.indexOf(",")!=-1){
+				String[] split = compileIdNew.split(",");
+				List<String> idList=new ArrayList<String>();
+				for (int i = 0; i < split.length; i++) {
+					idList.add(split[i]);
+				}
+				entity.setCompileIdNewList(idList);
+			}else{
+				entity.setCompileId(Integer.parseInt(compileIdNew));
+			}
+		}
 		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -12,8 +12,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.cfgKeywords}"){
 			$("#intype").val("${cfg.cfgKeywords}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -126,7 +126,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgKeywords"><spring:message code="domain"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -14,8 +14,8 @@
 			$("#intype").val("${cfg.destPort}");
 		} else if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		} else if("${cfg.compileId}"){
+		} else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		} else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -130,7 +130,7 @@
                                           		<form:select path="seltype" class="selectpicker select2 input-small" >
                                           		<form:option value="destIpAddress"><spring:message code="server_ip"></spring:message></form:option>
 												<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp

@@ -10,8 +10,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipCfg.destIpAddress}"){
 			$("#intype").val("${cfg.ipCfg.destIpAddress}");
 		}else if("${cfg.strCfg.cfgKeywords}"){
@@ -187,7 +187,7 @@
                                          <div class="input-group-btn">
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<c:if test="${cfg.functionId ne 564 && cfg.functionId ne 567}">
 													<form:option value="ipCfg.destIpAddress"><spring:message code="serverip"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -10,8 +10,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -181,7 +181,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp

@@ -12,8 +12,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.cfgKeywords}"){
 			$("#intype").val("${cfg.cfgKeywords}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -109,7 +109,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp

@@ -12,8 +12,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.cfgKeywords}"){
 			$("#intype").val("${cfg.cfgKeywords}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -125,7 +125,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgKeywords"><spring:message code="domain"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -22,8 +22,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -178,7 +178,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"/></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="avContUrlCfg.cfgKeywords"><spring:message code="URL"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -8,8 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -105,7 +105,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
 											</form:select>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -22,8 +22,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -99,6 +99,11 @@
 			$("#"+openId).show();
 			$("#"+closeId).parent().parent().next("tr").hide();
 		}); 
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 	
 </script>
@@ -143,6 +148,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/voipList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -169,7 +176,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"/></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="keywords"/></form:option>

src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp

@@ -10,8 +10,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -184,7 +184,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp

@@ -10,8 +10,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -181,7 +181,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<%-- <form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="APP_SUBSCRIBE_ID"></spring:message></form:option> --%>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp

@@ -10,8 +10,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -176,7 +176,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="cfdsLevel"><spring:message code="harm_level"/></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp

@@ -10,8 +10,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -151,7 +151,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="searchKeywords"><spring:message code="keywords"/></form:option>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -165,7 +165,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="p2pKeyword.cfgKeywords"><spring:message code="p2p_eMule_keywords"/></form:option>

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -174,7 +174,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<c:if test="${cfg.functionId eq 212}">

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -162,7 +162,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -10,8 +10,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -164,7 +164,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<c:if test="${cfg.functionId eq '35'}">
 													<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 													<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatPolicyList2.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
 		}else if("${cfg.srcPort}"){
@@ -133,7 +133,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="srcIpAddress"><spring:message code="original_dest_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="original_dest_port"></spring:message></form:option>
 												<%-- <form:option value="destIpAddress"><spring:message code="translated_dest_ip"></spring:message></form:option> --%>

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatPolicyList2.jsp

@@ -15,8 +15,8 @@
 			$("#intype").val("${cfg.userName}");
 		}else if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -123,7 +123,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<%-- <form:option value="srcIpAddress"><spring:message code="ip"></spring:message></form:option> --%>
 												<form:option value="userName"><spring:message code="user"></spring:message></form:option>
 												<%-- <form:option value="userType"><spring:message code="user_type"></spring:message></form:option> --%>

src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -165,7 +165,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="ntcBgpAsCfg.cfgKeywords"><spring:message code="keywords"/></form:option>

src/main/webapp/WEB-INF/views/cfg/proxy/cache/list.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.strCfg.cfgKeywords}"){
 			$("#intype").val("${cfg.strCfg.cfgKeywords}");
 		}else{
@@ -84,6 +84,11 @@
 			$("#serviceId").val($(this).attr("serviceId"));
 			$("#protocolId").val($(this).attr("protocolId"));
 		});
+		if($("#exportType").val() != null && $("#exportType").val() != ""){
+			 if($("#intype").val() != null && $("#intype").val() != ""){
+				$("#exportValue").val($("#intype").val());
+		  } 
+		}
 	}); 
 	
 </script>
@@ -122,6 +127,8 @@
 						<form:form id="searchForm" modelAttribute="cfg" action="${actionPath }" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
+							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
+							<input id="exportValue" type="hidden" value=""/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
@@ -148,7 +155,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="strCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -358,7 +358,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="httpUrl.cfgKeywords"><spring:message code="URL"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -163,7 +163,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="searchKeywords"><spring:message code="keywords"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -316,7 +316,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<c:if test="${cfg.functionId eq 8}">
 													<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 													<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -162,7 +162,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="ipPort.srcIpAddress"><spring:message code="clientip"></spring:message></form:option>
 												<form:option value="ipPort.destIpAddress"><spring:message code="serverip"></spring:message></form:option>
 												<form:option value="sslCfg.cfgKeywords"><spring:message code="keywords"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.httpUrl.cfgKeywords}"){
 			$("#intype").val("${cfg.httpUrl.cfgKeywords}");
 		}else{
@@ -145,7 +145,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<form:option value="httpUrl.cfgKeywords"><spring:message code="URL"></spring:message></form:option>
 												<form:option value="action"><spring:message code="block_type"></spring:message></form:option>
 												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>

src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp

@@ -9,8 +9,8 @@
 		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
+		}else if("${cfg.compileIdNew}"){
-			$("#intype").val("${cfg.compileId}");
+			$("#intype").val("${cfg.compileIdNew}");
 		}else if("${cfg.ipPort.srcIpAddress}"){
 			$("#intype").val("${cfg.ipPort.srcIpAddress}");
 		}else if("${cfg.ipPort.destIpAddress}"){
@@ -160,7 +160,7 @@
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
+												<form:option value="compileIdNew"><spring:message code="cfg_id"></spring:message></form:option>
 												<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
 												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
 												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js

@@ -24,6 +24,16 @@
 	});
 }(jQuery));
 
+//cfgId  新增配置ID查询条件验证 1,2,3  1-3
+jQuery.validator.addMethod("compileIdCheck",function(value,element){
+	var flagTypeSame=true;
+	if(this.optional(element) || /^(\d+,)*\d+$/.test(value) || /^(\d+-)?\d+$/.test(value)){
+		flagTypeSame=true;
+	}else{
+		flagTypeSame=false;
+	}
+	return flagTypeSame ;
+},$.validator.messages.compileIdCheck);
 jQuery.validator.addMethod("hexCheck", function(value, element) {
 	return this.optional(element) || /^([0-9|a-f|A-F]*)$/.test(value);   
 }, $.validator.messages.hexCheck);

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js

@@ -92,6 +92,7 @@
 		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!",
 		log_no_data:"This hour no data",
 		expireTip:"Start time and end time interval is at least 1 minute",
-		compareTip:"Start time should not be less than the current time plus 2 minutes."
+		compareTip:"Start time should not be less than the current time plus 2 minutes.",
+		compileIdCheck:"Please enter the correct query format"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js

@@ -92,6 +92,7 @@
 		protect_warn:"Policy with relax precondition may consume too much resources.Use with cautions!",
 		log_no_data:"Нет данных за этот час",
 		expireTip:"Start time and end time interval is at least 1 minute",
-		compareTip:"Start time should not be less than the current time plus 2 minutes."
+		compareTip:"Start time should not be less than the current time plus 2 minutes.",
+		compileIdCheck:"Please enter the correct query format"
 	});
 }(jQuery));

src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js

@@ -92,6 +92,7 @@
 		protect_warn:"该策略执行条件过于宽泛，会消耗较多的计算资源。慎用！",
 	    log_no_data:"本小时无数据",
 	    expireTip:"开始时间结束时间间隔至少为1分钟",
-	    compareTip:"开始时间不能小于当前时间加上2分钟 "
+	    compareTip:"开始时间不能小于当前时间加上2分钟 ",
+	    compileIdCheck:"请输入正确的查询格式"
 	});
 }(jQuery));

src/main/webapp/static/global/scripts/common.js

@@ -739,25 +739,25 @@ window.onload=function(){
 		$("div[class='content content5']").find("label:lt(1)").addClass("keyword-disinline");//page.css 关键词换行
 	})
 	// 配置id的搜索下拉框选择切换
-	if ($("#searchForm #seltype").val() == 'compileId') {
+	if ($("#searchForm #seltype").val() == 'compileIdNew') {
-		$("#searchForm #intype").addClass("number");
+		$("#searchForm #intype").addClass("compileIdCheck");
 	} else {
-		$("#searchForm #intype").removeClass("number");
+		$("#searchForm #intype").removeClass("compileIdCheck");
 	}
 	// reset时去掉number
 	$("#resetBtn").on("click", function() {
-		if ($("#searchForm #seltype").val() == 'compileId') {
+		if ($("#searchForm #seltype").val() == 'compileIdNew') {
-			$("#searchForm #intype").addClass("number");
+			$("#searchForm #intype").addClass("compileIdCheck");
 		} else {
-			$("#searchForm #intype").removeClass("number");
+			$("#searchForm #intype").removeClass("compileIdCheck");
 		}
 	});
 	// 切换时为compileId加上number
 	$("#searchForm #seltype").on("change", function() {
-		if ($("#searchForm #seltype").val() == 'compileId') {
+		if ($("#searchForm #seltype").val() == 'compileIdNew') {
-			$("#searchForm #intype").addClass("number");
+			$("#searchForm #intype").addClass("compileIdCheck");
 		} else {
-			$("#searchForm #intype").removeClass("number");
+			$("#searchForm #intype").removeClass("compileIdCheck");
 		}
 	});