(1)修复忽略单属性判断时方向属性取错的bug

(2)Packet IP reject 协议特殊处理

src/main/java/com/nis/util/excel/ImportExcel.java

@@ -31,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import com.google.common.collect.Lists;
 import com.nis.domain.FunctionRegionDict;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.configuration.template.ComplexStringAllTemplate;
 import com.nis.domain.configuration.template.IpAllTemplate;
 import com.nis.domain.configuration.template.StringAllTemplate;
@@ -493,7 +494,7 @@ public class ImportExcel {
 	 * @param cls 导入对象类型
 	 * @param groups 导入分组
 	 */
-	public <E> List<E> getDataList(Class<E> cls,Properties props,FunctionRegionDict regionDict, int... groups) throws InstantiationException, IllegalAccessException{
+	public <E> List<E> getDataList(Class<E> cls,Properties props,FunctionRegionDict regionDict,FunctionServiceDict serviceDict, int... groups) throws InstantiationException, IllegalAccessException{
 		if(regionDict==null) {
 			throw new RuntimeException("regionDict is null!");
 		}
@@ -535,12 +536,16 @@ public class ImportExcel {
 			//协议方向等，如果只有一个值，就 不需要输入了
 			String direction=regionDict.getConfigDirection();
 			if(StringUtils.isNotBlank(direction)&&direction.indexOf(",")>-1) {
-				districtShow=true;
+				directionShow=true;
 			}
 			String protocol=regionDict.getConfigProtocol();
 			if(StringUtils.isNotBlank(protocol)&&protocol.indexOf(",")>-1) {
 				protocolShow=true;
 			}
+			//packet ip reject
+			if(regionDict.getFunctionId().equals(5)&&serviceDict!=null&&serviceDict.getServiceId().equals(16)) {
+				protocolShow=false;
+			}
 		}else if(regionType==2||regionType==3){
 			String matchMethod= regionDict.getConfigMatchMethod();
 			if(StringUtils.isNotBlank(matchMethod)&&matchMethod.indexOf(",")>-1) {