Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
@@ -29,8 +29,6 @@ import com.nis.web.security.UserUtils;
|
||||
@RequestMapping("${adminPath}/systemService")
|
||||
public class SystemServiceController extends BaseController {
|
||||
|
||||
//TODO 异常处理
|
||||
|
||||
@ModelAttribute
|
||||
public SystemServiceInfo get(Long id) {
|
||||
if (!StringUtil.isEmpty(id)){
|
||||
@@ -119,9 +117,14 @@ public class SystemServiceController extends BaseController {
|
||||
@RequestMapping(value = "delete")
|
||||
public String delete(Model model, SystemServiceInfo systemServiceInfo, HttpServletRequest request, HttpServletResponse response) {
|
||||
systemServiceService.deleteService(systemServiceInfo);
|
||||
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo);
|
||||
model.addAttribute("page", page);
|
||||
addMessage(model, "删除成功");
|
||||
try {
|
||||
Page<SystemServiceInfo> page = systemServiceService.findPage(new Page<SystemServiceInfo>(request, response, 1), systemServiceInfo);
|
||||
model.addAttribute("page", page);
|
||||
addMessage(model, "删除成功");
|
||||
} catch (Exception e) {
|
||||
addMessage(model, "删除失败:" + e.getMessage());
|
||||
e.printStackTrace();
|
||||
}
|
||||
return "/systemService/list";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user