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

查漏补缺 addMessage() messageType;

Browse Source
This commit is contained in:
zhangwq
2018-12-13 14:01:06 +08:00
parent 6dab8a5950
commit 46efc3320d
82 changed files with 174 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/nis/web/controller/sys/RoleController.java
View File

@@ -143,11 +143,11 @@ public class RoleController extends BaseController {
public String saveOrUpdate(SysRole role, Model model, RedirectAttributes redirectAttributes) {
if (!"true".equals(checkName(role.getOldName(), role.getName()))){
addMessage(model, "save_failed");
addMessage(model,"error", "save_failed");
return form(role, model);
}
roleService.saveOrUpdate(role);
addMessage(redirectAttributes, "save_success");
addMessage(redirectAttributes,"success", "save_success");
return "redirect:" + adminPath + "/sys/role/?repage";
}
@@ -155,7 +155,7 @@ public class RoleController extends BaseController {
@RequestMapping(value = "delete")
public String delete(SysRole role, RedirectAttributes redirectAttributes) {
roleService.deleteRole(role);
addMessage(redirectAttributes, "delete_success");
addMessage(redirectAttributes,"success", "delete_success");
return "redirect:" + adminPath + "/sys/role/?repage";
}
@@ -195,16 +195,16 @@ public class RoleController extends BaseController {
if (UserUtils.getUser().getId().equals(userId)) {
/*format(getMsgProp().get("single_file_upload_size_error").toString(),
role.getName(),user.getName());*/
addMessage(redirectAttributes, "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
addMessage(redirectAttributes,"error", "无法从角色【" + role.getName() + "】中移除用户【" + user.getName() + "】自己！");
}else {
if (user.getUserRoleList().size() <= 1){
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！这已经是该用户的唯一角色，不能移除。");
}else{
Boolean flag = systemService.outUserInRole(role, user);
if (!flag) {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
addMessage(redirectAttributes,"error", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除失败！");
}else {
addMessage(redirectAttributes, "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
addMessage(redirectAttributes,"success", "用户【" + user.getName() + "】从角色【" + role.getName() + "】中移除成功！");
}
}
}