修复IP 导出ASN空指针异常，ASN IP导出排除列取消审核员的排除

src/main/java/com/nis/web/controller/basics/AsnIpController.java

@@ -11,7 +11,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -28,9 +27,6 @@ import com.nis.domain.Page;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.IpPortCfg;
-
-import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
 //import com.nis.util.AsnCacheUtils;
 import com.nis.util.Constants;
@@ -232,7 +228,7 @@ public class AsnIpController extends BaseController{
 				titleList.add(entity.getMenuNameCode());
 				classMap.put(entity.getMenuNameCode(), AsnIpCfg.class);
 				String cfgIndexInfoNoExport=",block_type,do_log,action"
-						+ ",auditor,audit_time,letter,whether_area_block,classification,attribute,label"
+						+ ",letter,whether_area_block,classification,attribute,label"
 						+",userregion2,userregion3,userregion4,userregion5,ir_type,group_name,&userregion1:asn_no-";
 				// 时间过滤
 				if (entity.getSearch_create_time_start() == null ) {

src/main/java/com/nis/web/controller/configuration/ntc/IpController.java

@@ -25,7 +25,6 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
-import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.configuration.AsnKeywordCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
@@ -59,7 +58,6 @@ import com.nis.domain.configuration.template.P2pHashStringTemplate;
 import com.nis.domain.configuration.template.P2pIpTemplate;
 import com.nis.domain.configuration.template.SnatTemplate;
 import com.nis.domain.configuration.template.StringAllTemplate;
-import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
@@ -564,7 +562,10 @@ public class IpController extends BaseController{
 					for (CfgIndexInfo cfg : ipLists) {
 						CfgIndexInfo cfgIndexInfo=ipCfgService.exportIpInfo(cfg);
 						ipList.addAll(cfgIndexInfo.getIpPortList());
-						groupInfoList.addAll(cfgIndexInfo.getAsnKeywords());
+						if(cfgIndexInfo.getAsnKeywords()!=null) {
+							groupInfoList.addAll(cfgIndexInfo.getAsnKeywords());
+						}
+						
 					}
 					dataMap.put(entity.getMenuNameCode(), ipLists);
 					dataMap.put("NTC_IP", ipList);