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

无变化

Browse Source
This commit is contained in:
DuanDongmei
2018-11-29 09:24:29 +08:00
parent 69a4e6c3e9
commit 2c1fa458dc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ public class IpController extends BaseController{
@RequiresPermissions(value={"iplist:config"}) @RequiresPermissions(value={"iplist:config"})
public String form(Model model,String ids,CfgIndexInfo entity) { public String form(Model model,String ids,CfgIndexInfo entity) {
if(StringUtils.isNotBlank(ids)){ if(StringUtils.isNotBlank(ids)){
entity = ipCfgService.getIpPortCfg(Long.parseLong(ids)); entity = ipCfgService.getIpPortCfg(Long.parseLong(ids),entity.getCompileId());
initUpdateFormCondition(model,entity); initUpdateFormCondition(model,entity);
}else{ }else{
initFormCondition(model,entity); initFormCondition(model,entity);
@@ -89,8 +89,8 @@ public class IpController extends BaseController{
return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId(); return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
} }
@RequestMapping(value = {"ajaxSubList"}) @RequestMapping(value = {"ajaxSubList"})
public String ajaxIpPortSubList(Model model,Long cfgId,Integer index) { public String ajaxIpPortSubList(Model model,Long cfgId,Integer index,Integer compileId) {
CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId); CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId,compileId);
/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId()); /*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
model.addAttribute("regionList", regionList);*/ model.addAttribute("regionList", regionList);*/
List<String[]> tabList = new ArrayList(); List<String[]> tabList = new ArrayList();
@@ -133,7 +133,7 @@ public class IpController extends BaseController{
CfgIndexInfo entity = new CfgIndexInfo(); CfgIndexInfo entity = new CfgIndexInfo();
String[] idArray = ids.split(","); String[] idArray = ids.split(",");
for(String id :idArray){ for(String id :idArray){
entity = ipCfgService.getIpPortCfg(Long.parseLong(id)); entity = ipCfgService.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
entity.setIsAudit(isAudit); entity.setIsAudit(isAudit);
entity.setIsValid(isValid); entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId()); entity.setAuditorId(UserUtils.getUser().getId());