From de94ab2fb816f81f4c907f8eaf875f98fe108f8e Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 22 Nov 2019 17:42:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwar=E5=8C=85=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E6=83=85=E5=86=B5=E4=B8=8B404=E3=80=81500=E7=AD=89?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=B8=A2=E5=A4=B1=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/templates/error/404.html | 8 +++--- .../main/resources/templates/error/500.html | 8 +++--- .../resources/templates/error/business.html | 6 ++--- .../resources/templates/error/unauth.html | 8 +++--- .../main/resources/vm/java/Controller.java.vm | 26 +++++++++---------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/error/404.html b/ruoyi-admin/src/main/resources/templates/error/404.html index 4221066..22e8f89 100644 --- a/ruoyi-admin/src/main/resources/templates/error/404.html +++ b/ruoyi-admin/src/main/resources/templates/error/404.html @@ -4,9 +4,9 @@ RuoYi - 404 - - - + + +
@@ -14,7 +14,7 @@

找不到网页！

对不起，您正在寻找的页面不存在。尝试检查URL的错误，然后按浏览器上的刷新按钮或尝试在我们的应用程序中找到其他内容。 - 主页 + 主页
diff --git a/ruoyi-admin/src/main/resources/templates/error/500.html b/ruoyi-admin/src/main/resources/templates/error/500.html index 5e9d150..70d8224 100644 --- a/ruoyi-admin/src/main/resources/templates/error/500.html +++ b/ruoyi-admin/src/main/resources/templates/error/500.html @@ -4,9 +4,9 @@ RuoYi - 500 - - - + + +
@@ -15,7 +15,7 @@
服务器遇到意外事件，不允许完成请求。我们抱歉。您可以返回主页面。 - 主页 + 主页
diff --git a/ruoyi-admin/src/main/resources/templates/error/business.html b/ruoyi-admin/src/main/resources/templates/error/business.html index f47cde7..6875b82 100644 --- a/ruoyi-admin/src/main/resources/templates/error/business.html +++ b/ruoyi-admin/src/main/resources/templates/error/business.html @@ -4,9 +4,9 @@ RuoYi - 403 - - - + + +
diff --git a/ruoyi-admin/src/main/resources/templates/error/unauth.html b/ruoyi-admin/src/main/resources/templates/error/unauth.html index 739a8ce..8da1b2f 100644 --- a/ruoyi-admin/src/main/resources/templates/error/unauth.html +++ b/ruoyi-admin/src/main/resources/templates/error/unauth.html @@ -4,9 +4,9 @@ RuoYi - 403 - - - + + +
@@ -15,7 +15,7 @@
对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面 - 返回主页 + 返回主页
diff --git a/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm index 15f6000..2c6e51d 100644 --- a/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm +++ b/ruoyi-generator/src/main/resources/vm/java/Controller.java.vm @@ -46,19 +46,7 @@ public class ${ClassName}Controller extends BaseController return prefix + "/${businessName}"; } -#if($table.tree) - /** - * 查询${functionName}树列表 - */ - @RequiresPermissions("${permissionPrefix}:list") - @PostMapping("/list") - @ResponseBody - public List<${ClassName}> list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return list; - } -#elseif($table.crud) + #if($table.crud) /** * 查询${functionName}列表 */ @@ -71,6 +59,18 @@ public class ${ClassName}Controller extends BaseController List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); return getDataTable(list); } + #elseif($table.tree) + /** + * 查询${functionName}树列表 + */ + @RequiresPermissions("${permissionPrefix}:list") + @PostMapping("/list") + @ResponseBody + public List<${ClassName}> list(${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return list; + } #end /**