diff --git a/src/main/java/cn/palmte/work/controller/backend/SysPermissionController.java b/src/main/java/cn/palmte/work/controller/backend/SysPermissionController.java index 55d2bf0..529f7f3 100644 --- a/src/main/java/cn/palmte/work/controller/backend/SysPermissionController.java +++ b/src/main/java/cn/palmte/work/controller/backend/SysPermissionController.java @@ -7,6 +7,7 @@ import cn.palmte.work.model.SysPermissionRepository; import cn.palmte.work.service.SysPermissionService; import cn.palmte.work.service.SysRolePermissionService; import cn.palmte.work.utils.DateKit; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -74,13 +75,20 @@ public class SysPermissionController extends BaseController{ @PostMapping(value = "/save") public String save(@RequestParam("permissionID") String permissionID, - SysPermission sysPermission, RedirectAttributes attr) throws IOException{ + SysPermission sysPermission, RedirectAttributes attr, Map model) throws IOException{ final SysPermission parent = sysPermissionRepository.findOne(sysPermission.getParentId()); sysPermission.setLevel(parent.getLevel()+1); int type = (parent.getLevel()==4) ? 2 : 1; sysPermission.setType(type); + String message = sysPermissionService.check(sysPermission,permissionID); + + if (StringUtils.isNotEmpty(message)) { + model.put("errorMessage", message); + return "/common/error"; + } + if ("-1".equals(permissionID)){ getSql(sysPermission, attr, parent); sysPermissionService.addPermission(sysPermission); //新增 diff --git a/src/main/java/cn/palmte/work/model/SysPermissionRepository.java b/src/main/java/cn/palmte/work/model/SysPermissionRepository.java index 4dad8db..de9d08b 100644 --- a/src/main/java/cn/palmte/work/model/SysPermissionRepository.java +++ b/src/main/java/cn/palmte/work/model/SysPermissionRepository.java @@ -31,4 +31,8 @@ public interface SysPermissionRepository extends JpaRepository findPermissions(); + SysPermission findByUrlEquals(String url); + + SysPermission findByPermissionEquals(String permission); + } diff --git a/src/main/java/cn/palmte/work/model/SysPermissionRepositoryImpl.java b/src/main/java/cn/palmte/work/model/SysPermissionRepositoryImpl.java index 759a364..278edf1 100644 --- a/src/main/java/cn/palmte/work/model/SysPermissionRepositoryImpl.java +++ b/src/main/java/cn/palmte/work/model/SysPermissionRepositoryImpl.java @@ -96,7 +96,7 @@ public class SysPermissionRepositoryImpl implements SysPermissionRepositoryCusto public String getSqlExceptSelect(ConcurrentHashMap searchInfo){ // StringBuffer sqlExceptSelect=new StringBuffer(" from sys_permission p where 1=1 and is_deleted= 0 "); - StringBuffer sqlExceptSelect=new StringBuffer(" from sys_permission p where 1=1 "); + StringBuffer sqlExceptSelect=new StringBuffer(" from sys_permission p where 1=1 and p.is_deleted = 0 "); for(Map.Entry item : searchInfo.entrySet()){ sqlExceptSelect.append(buildQuery(item)); } diff --git a/src/main/java/cn/palmte/work/service/AccountService.java b/src/main/java/cn/palmte/work/service/AccountService.java index 1623745..f4b2506 100644 --- a/src/main/java/cn/palmte/work/service/AccountService.java +++ b/src/main/java/cn/palmte/work/service/AccountService.java @@ -66,7 +66,7 @@ public class AccountService { queryHelper.addCondition(searchInfo.containsKey("realName"), "u.real_name like ?", "%" + searchInfo.get("realName") + "%"); queryHelper.addCondition(searchInfo.containsKey("telephone"), "u.telephone =?", searchInfo.get("telephone")); - queryHelper.addCondition(searchInfo.containsKey("empCode"), "u.emp_code =?", searchInfo.get("empCode")); + queryHelper.addCondition(searchInfo.containsKey("userName"), "u.user_name =?", searchInfo.get("userName")); queryHelper.addCondition(searchInfo.containsKey("deptId") && StrKit.notBlank(searchInfo.get("deptId")) && !"-1".equals(searchInfo.get("deptId")), "u.dept_id =?", searchInfo.get("deptId")); diff --git a/src/main/java/cn/palmte/work/service/SysPermissionService.java b/src/main/java/cn/palmte/work/service/SysPermissionService.java index f68ec10..c50e8c4 100644 --- a/src/main/java/cn/palmte/work/service/SysPermissionService.java +++ b/src/main/java/cn/palmte/work/service/SysPermissionService.java @@ -123,4 +123,35 @@ public class SysPermissionService { } + public String check(SysPermission sysPermission, String permissionID) { + SysPermission byUrlEquals = sysPermissionRepository.findByUrlEquals(sysPermission.getUrl()); + String message = ""; + if ("-1".equals(permissionID)) { + if (null != byUrlEquals) { + message = "该URL已存在!"; + return message; + } + } else { + if (null != byUrlEquals && byUrlEquals.getId() != Integer.parseInt(permissionID)) { + message = "该URL已存在!"; + return message; + } + } + + SysPermission byPermissionEquals = sysPermissionRepository.findByPermissionEquals(sysPermission.getPermission()); + + if ("-1".equals(permissionID)) { + if (null != byPermissionEquals) { + message = "该权限编码已存在!"; + return message; + } + } else { + if (null != byPermissionEquals && byPermissionEquals.getId() != Integer.parseInt(permissionID)) { + message = "该权限编码已存在!"; + return message; + } + } + + return message; + } } diff --git a/src/main/resources/templates/admin/account_list.ftl b/src/main/resources/templates/admin/account_list.ftl index dcb2438..feee5c9 100644 --- a/src/main/resources/templates/admin/account_list.ftl +++ b/src/main/resources/templates/admin/account_list.ftl @@ -33,8 +33,8 @@ 工号
- +
@@ -264,8 +264,8 @@ keywordsObj.realName = $("#realName").val(); if ($("#telephone").val()) keywordsObj.telephone = $("#telephone").val(); - if ($("#empCode").val()) - keywordsObj.empCode = $("#empCode").val(); + if ($("#userName").val()) + keywordsObj.userName = $("#userName").val(); if ($("#deptId").val()) keywordsObj.deptId = $("#deptId").val(); if ($("#roleId").val()) @@ -334,8 +334,8 @@ keywordsObj.realName = $("#realName").val(); if ($("#telephone").val()) keywordsObj.telephone = $("#telephone").val(); - if ($("#empCode").val()) - keywordsObj.empCode = $("#empCode").val(); + if ($("#userName").val()) + keywordsObj.userName = $("#userName").val(); if ($("#deptId").val()) keywordsObj.deptId = $("#deptId").val(); if ($("#roleId").val())