diff --git a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java index c2775441..feb1dda2 100644 --- a/maxkey-core/src/main/java/org/maxkey/domain/Resources.java +++ b/maxkey-core/src/main/java/org/maxkey/domain/Resources.java @@ -38,6 +38,7 @@ public class Resources extends JpaBaseDomain implements Serializable { int sortIndex; @Column String appId; + String appName; @Column String parentId; @Column @@ -94,6 +95,14 @@ public class Resources extends JpaBaseDomain implements Serializable { this.appId = appId; } + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + public String getParentId() { return parentId; } diff --git a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml index 1e532500..70d073e6 100644 --- a/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml +++ b/maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/ResourcesMapper.xml @@ -4,16 +4,16 @@ - AND ID = #{id} + AND RES.ID = #{id} - AND APPID = #{appId} + AND RES.APPID = #{appId} - AND PARENTID = #{parentId} + AND RES.PARENTID = #{parentId} - AND NAME LIKE '%${name}%' + AND RES.NAME LIKE '%${name}%' @@ -21,13 +21,13 @@ diff --git a/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl b/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl index be2d498e..869a97a7 100644 --- a/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl +++ b/maxkey-web-manage/src/main/resources/templates/views/resources/resourcesList.ftl @@ -239,13 +239,12 @@ $(function () { Id + <@locale code="apps.name"/> <@locale code="resource.name"/> <@locale code="resource.resourceType"/> <@locale code="common.text.sortindex"/> - <@locale code="resource.resourceUrl"/> <@locale code="resource.resourceAction"/> <@locale code="common.text.description"/> -