无变化

This commit is contained in:
DuanDongmei
2018-11-29 09:24:29 +08:00
parent 69a4e6c3e9
commit 2c1fa458dc

View File

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