diff --git a/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java b/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java index 2a90c403..dbbbf721 100644 --- a/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java +++ b/service-permission/src/main/java/ink/wgink/service/permission/service/impl/PermissionServiceImpl.java @@ -38,6 +38,15 @@ public class PermissionServiceImpl extends DefaultBaseService implements IPermis @Override public void save(PermissionVO permissionVO) { + Map params = getHashMap(4); + params.put("permissionUrl", permissionVO.getPermissionUrl()); + params.put("permissionType", permissionVO.getPermissionType()); + params.put("apiTag", permissionVO.getApiTag()); + params.put("systemTag", permissionVO.getSystemTag()); + List permissionDTOs = list(params); + if (!permissionDTOs.isEmpty()) { + return; + } savePermissionReturnId(permissionVO); } diff --git a/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml b/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml index d1c4a5dc..2e68df91 100644 --- a/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml +++ b/service-permission/src/main/resources/mybatis/mapper/permission-mapper.xml @@ -160,6 +160,8 @@ AND ( t1.permission_title LIKE CONCAT('%', #{keywords}, '%') OR + t1.api_tag LIKE CONCAT('%', #{keywords}, '%') + OR t1.system_tag LIKE CONCAT('%', #{keywords}, '%') ) @@ -175,6 +177,10 @@ AND t1.api_tag = #{apiTag} + + AND + t1.permission_url = #{permissionUrl} + AND t1.is_public = #{isPublic} diff --git a/service-permission/src/main/resources/templates/permission/list.html b/service-permission/src/main/resources/templates/permission/list.html index 1560180e..7bac3f78 100644 --- a/service-permission/src/main/resources/templates/permission/list.html +++ b/service-permission/src/main/resources/templates/permission/list.html @@ -112,6 +112,15 @@ return '错误'; } }, + {field: 'apiTag', width: 180, title: '接口标识', align:'center', + templet: function(row) { + var rowData = row[this.field]; + if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { + return '-'; + } + return rowData; + } + }, {field: 'systemTag', width: 180, title: '系统标识', align:'center', templet: function(row) { var rowData = row[this.field]; diff --git a/service-permission/src/main/resources/templates/permission/save.html b/service-permission/src/main/resources/templates/permission/save.html index 25fc2f49..548f6ce4 100644 --- a/service-permission/src/main/resources/templates/permission/save.html +++ b/service-permission/src/main/resources/templates/permission/save.html @@ -38,13 +38,13 @@
- +
- +
diff --git a/service-permission/src/main/resources/templates/permission/update.html b/service-permission/src/main/resources/templates/permission/update.html index 20ec8157..ec2e6fb6 100644 --- a/service-permission/src/main/resources/templates/permission/update.html +++ b/service-permission/src/main/resources/templates/permission/update.html @@ -38,13 +38,13 @@
- +
- +