调整批量审核错误提示,既保持查询条件也能提示错误
This commit is contained in:
@@ -31,10 +31,13 @@ import java.util.*;
|
|||||||
public class ObjectGroupController extends BaseController {
|
public class ObjectGroupController extends BaseController {
|
||||||
@RequestMapping(value = { "/list" })
|
@RequestMapping(value = { "/list" })
|
||||||
public String list(Model model, @ModelAttribute("cfg") CfgIndexInfo cfg, HttpServletRequest request,
|
public String list(Model model, @ModelAttribute("cfg") CfgIndexInfo cfg, HttpServletRequest request,
|
||||||
HttpServletResponse response){
|
HttpServletResponse response,String tip){
|
||||||
Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
|
Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
|
||||||
Page<CfgIndexInfo> page = objectGroupService.getPolicyListList(searchPage, cfg);
|
Page<CfgIndexInfo> page = objectGroupService.getPolicyListList(searchPage, cfg);
|
||||||
model.addAttribute("page", page);
|
model.addAttribute("page", page);
|
||||||
|
if(StringUtils.isNotBlank(tip)){
|
||||||
|
addMessage("error",model,tip);
|
||||||
|
}
|
||||||
initPageCondition(model,cfg);
|
initPageCondition(model,cfg);
|
||||||
return "/cfg/objgroup/list";
|
return "/cfg/objgroup/list";
|
||||||
}
|
}
|
||||||
@@ -270,7 +273,7 @@ public class ObjectGroupController extends BaseController {
|
|||||||
objectGroupService.auditPolicy(entity,isAudit,Constants.INSERT_ACTION);
|
objectGroupService.auditPolicy(entity,isAudit,Constants.INSERT_ACTION);
|
||||||
}
|
}
|
||||||
if(tip.toString().length()>0){
|
if(tip.toString().length()>0){
|
||||||
addMessage(redirectAttributes,"success", tip.toString());
|
addMessage(redirectAttributes,"error", tip.toString());
|
||||||
}else{
|
}else{
|
||||||
addMessage(redirectAttributes,"success", "audit_success");
|
addMessage(redirectAttributes,"success", "audit_success");
|
||||||
}
|
}
|
||||||
@@ -289,12 +292,12 @@ public class ObjectGroupController extends BaseController {
|
|||||||
}else {
|
}else {
|
||||||
Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"r");
|
Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"r");
|
||||||
Page<CfgIndexInfo> auditPage=new Page<CfgIndexInfo>(request,response,"r");
|
Page<CfgIndexInfo> auditPage=new Page<CfgIndexInfo>(request,response,"r");
|
||||||
|
String tip=null;
|
||||||
try {
|
try {
|
||||||
BeanUtils.copyProperties(searchPage, auditPage);
|
BeanUtils.copyProperties(searchPage, auditPage);
|
||||||
String tip= auditAll(auditPage,isValid , cfg,props);
|
tip= auditAll(auditPage,isValid , cfg,props);
|
||||||
if(tip.toString().length()>0){
|
if(tip.toString().length()>0){
|
||||||
addMessage(redirectAttributes,"success", tip.toString());
|
addMessage(redirectAttributes,"error", tip.toString());
|
||||||
}else{
|
}else{
|
||||||
addMessage(redirectAttributes,"success", "audit_success");
|
addMessage(redirectAttributes,"success", "audit_success");
|
||||||
}
|
}
|
||||||
@@ -310,7 +313,7 @@ public class ObjectGroupController extends BaseController {
|
|||||||
|
|
||||||
}
|
}
|
||||||
//无法保存状态
|
//无法保存状态
|
||||||
// return list(model, cfg, request, response);
|
return list(model, cfg, request, response,tip);
|
||||||
}
|
}
|
||||||
return "redirect:" + adminPath +"/objgroup/list?functionId="+functionId;
|
return "redirect:" + adminPath +"/objgroup/list?functionId="+functionId;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user