gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复Policy Group导出列顺序，action与界面不一致，url组中出现null

Browse Source
This commit is contained in:
wangxin
2019-06-24 11:08:27 +08:00
parent 1eaf3fb4c6
commit 7dfe52590b
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/domain/configuration/ObjGroupCfg.java
View File

@@ -4,17 +4,16 @@ import com.nis.util.excel.ExcelField;
public class ObjGroupCfg extends BaseCfg<ObjGroupCfg> {
@ExcelField(title="ip_group",sort=50)
@ExcelField(title="ip_group",sort=33)
private String ipGroup;
@ExcelField(title="url_group",sort=51)
@ExcelField(title="url_group",sort=35)
private String urlGroup;
@ExcelField(title="subscribe_id_group",sort=52)
@ExcelField(title="subscribe_id_group",sort=34)
private String subscribeIdGroup;
@ExcelField(title="domain_group",sort=53)
@ExcelField(title="domain_group",sort=36)
private String domainGroup;
@ExcelField(title="action",sort=2)
@ExcelField(title="block_type",sort=2)//这里没有使用公共方法处理，直接将字典值set进去了，不用使用dictType
protected String actionCode;
public String getActionCode() {
return actionCode;
}
@@ -54,4 +53,5 @@ public class ObjGroupCfg extends BaseCfg<ObjGroupCfg> {
public void setDomainGroup(String domainGroup) {
this.domainGroup = domainGroup;
}
protected Integer action;//覆盖默认的action上的注解
}