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

10
src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
View File

@@ -563,9 +563,10 @@ public class ObjectGroupService extends BaseService {
}
}
}
// c.setActionCode(c.getAction().toString());
for (FunctionServiceDict service : serviceList) {
if(c.getAction().intValue()==service.getAction().intValue()){
c.setActionCode(msgProp.getProperty(service.getActionCode(),service.getActionCode()));
c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode()));
}
}
}
@@ -587,7 +588,7 @@ public class ObjectGroupService extends BaseService {
c.setIpGroup(name);
policyGroupInfoMap.remove(e.getKey());
}else if(e.getValue().getGroupType().equals(Constants.URL_OBJ_GROUP_TYPE)){
String name=(StringUtils.isBlank(c.getIpGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName();
String name=(StringUtils.isBlank(c.getUrlGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName();
c.setUrlGroup(name);
policyGroupInfoMap.remove(e.getKey());
}else if(e.getValue().getGroupType().equals(Constants.SUBID_OBJ_GROUP_TYPE)){
@@ -624,9 +625,10 @@ public class ObjectGroupService extends BaseService {
}
}
}
// c.setActionCode(c.getAction().toString());
for (FunctionServiceDict service : serviceList) {
if(c.getAction().intValue()==service.getAction().intValue()){
c.setActionCode(msgProp.getProperty(service.getActionCode(),service.getActionCode()));
c.setActionCode(msgProp.getProperty("action_"+service.getActionCode(),"action_"+service.getActionCode()));
}
}
}
@@ -648,7 +650,7 @@ public class ObjectGroupService extends BaseService {
c.setIpGroup(name);
policyGroupInfoMap.remove(e.getKey());
}else if(e.getValue().getGroupType().equals(Constants.URL_OBJ_GROUP_TYPE)){
String name=(StringUtils.isBlank(c.getIpGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName();
String name=(StringUtils.isBlank(c.getUrlGroup())?"":c.getUrlGroup())+","+e.getValue().getGroupName();
c.setUrlGroup(name);
policyGroupInfoMap.remove(e.getKey());
}else if(e.getValue().getGroupType().equals(Constants.SUBID_OBJ_GROUP_TYPE)){